Commit d81b8a40 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Cleanup cifs open codepath 



Rename CIFSSMBOpen to CIFS_open and make it take
cifs_open_parms structure as a parm.

Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 0360d605

fs/cifs/cifsacl.c

+28 −12
Original line number Diff line number Diff line
@@ -895,9 +895,10 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	int oplock = 0;

	unsigned int xid;

	int rc, create_options = 0;

	__u16 fid;

	struct cifs_tcon *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct cifs_fid fid;

	struct cifs_open_parms oparms;



	if (IS_ERR(tlink))

		return ERR_CAST(tlink);
@@ -908,12 +909,19 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;



	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, READ_CONTROL,

			create_options, &fid, &oplock, NULL, cifs_sb->local_nls,

			cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = READ_CONTROL;

	oparms.create_options = create_options;

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

	oparms.reconnect = false;



	rc = CIFS_open(xid, &oparms, &oplock, NULL);

	if (!rc) {

		rc = CIFSSMBGetCIFSACL(xid, tcon, fid, &pntsd, pacllen);

		CIFSSMBClose(xid, tcon, fid);

		rc = CIFSSMBGetCIFSACL(xid, tcon, fid.netfid, &pntsd, pacllen);

		CIFSSMBClose(xid, tcon, fid.netfid);

	}



	cifs_put_tlink(tlink);
@@ -950,10 +958,11 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	int oplock = 0;

	unsigned int xid;

	int rc, access_flags, create_options = 0;

	__u16 fid;

	struct cifs_tcon *tcon;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct cifs_fid fid;

	struct cifs_open_parms oparms;



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);
@@ -969,18 +978,25 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	else

		access_flags = WRITE_DAC;



	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, access_flags,

			create_options, &fid, &oplock, NULL, cifs_sb->local_nls,

			cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = access_flags;

	oparms.create_options = create_options;

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

	oparms.reconnect = false;



	rc = CIFS_open(xid, &oparms, &oplock, NULL);

	if (rc) {

		cifs_dbg(VFS, "Unable to open file to set ACL\n");

		goto out;

	}



	rc = CIFSSMBSetCIFSACL(xid, tcon, fid, pnntsd, acllen, aclflag);

	rc = CIFSSMBSetCIFSACL(xid, tcon, fid.netfid, pnntsd, acllen, aclflag);

	cifs_dbg(NOISY, "SetCIFSACL rc = %d\n", rc);



	CIFSSMBClose(xid, tcon, fid);

	CIFSSMBClose(xid, tcon, fid.netfid);

out:

	free_xid(xid);

	cifs_put_tlink(tlink);

fs/cifs/cifsproto.h

+2 −5
Original line number Diff line number Diff line
@@ -362,11 +362,8 @@ extern int CIFSSMBQuerySymLink(const unsigned int xid, struct cifs_tcon *tcon, 
			       const struct nls_table *nls_codepage);

extern int CIFSSMB_set_compression(const unsigned int xid,

				   struct cifs_tcon *tcon, __u16 fid);

extern int CIFSSMBOpen(const unsigned int xid, struct cifs_tcon *tcon,

		       const char *path, const int disposition,

		       const int desired_access, const int create_options,

		       __u16 *netfid, int *oplock, FILE_ALL_INFO *buf,

		       const struct nls_table *nls, int remap);

extern int CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms,

		     int *oplock, FILE_ALL_INFO *buf);

extern int SMBLegacyOpen(const unsigned int xid, struct cifs_tcon *tcon,

			const char *fileName, const int disposition,

			const int access_flags, const int omode,

fs/cifs/cifssmb.c

+11 −5
Original line number Diff line number Diff line
@@ -1273,10 +1273,8 @@ SMBLegacyOpen(const unsigned int xid, struct cifs_tcon *tcon, 
}



int

CIFSSMBOpen(const unsigned int xid, struct cifs_tcon *tcon,

	    const char *path, const int disposition, const int desired_access,

	    const int create_options, __u16 *netfid, int *oplock,

	    FILE_ALL_INFO *buf, const struct nls_table *nls, int remap)

CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock,

	  FILE_ALL_INFO *buf)

{

	int rc = -EACCES;

	OPEN_REQ *req = NULL;
@@ -1284,6 +1282,14 @@ CIFSSMBOpen(const unsigned int xid, struct cifs_tcon *tcon, 
	int bytes_returned;

	int name_len;

	__u16 count;

	struct cifs_sb_info *cifs_sb = oparms->cifs_sb;

	struct cifs_tcon *tcon = oparms->tcon;

	int remap = cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR;

	const struct nls_table *nls = cifs_sb->local_nls;

	int create_options = oparms->create_options;

	int desired_access = oparms->desired_access;

	int disposition = oparms->disposition;

	const char *path = oparms->path;



openRetry:

	rc = smb_init(SMB_COM_NT_CREATE_ANDX, 24, tcon, (void **)&req,
@@ -1367,7 +1373,7 @@ CIFSSMBOpen(const unsigned int xid, struct cifs_tcon *tcon, 
	/* 1 byte no need to le_to_cpu */

	*oplock = rsp->OplockLevel;

	/* cifs fid stays in le */

	*netfid = rsp->Fid;

	oparms->fid->netfid = rsp->Fid;



	/* Let caller know file was created so we can set the mode. */

	/* Do we care about the CreateAction in any other cases? */

fs/cifs/dir.c

+14 −7
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 
	char *full_path = NULL;

	struct inode *newinode = NULL;

	int oplock = 0;

	u16 netfid;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;

	FILE_ALL_INFO *buf = NULL;

	unsigned int bytes_written;

	struct win_dev *pdev;
@@ -640,10 +641,16 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 
	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;



	rc = CIFSSMBOpen(xid, tcon, full_path, FILE_CREATE,

			 GENERIC_WRITE, create_options,

			 &netfid, &oplock, buf, cifs_sb->local_nls,

			 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = GENERIC_WRITE;

	oparms.create_options = create_options;

	oparms.disposition = FILE_CREATE;

	oparms.path = full_path;

	oparms.fid = &fid;

	oparms.reconnect = false;



	rc = CIFS_open(xid, &oparms, &oplock, buf);

	if (rc)

		goto mknod_out;
@@ -653,7 +660,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 
	 */



	pdev = (struct win_dev *)buf;

	io_parms.netfid = netfid;

	io_parms.netfid = fid.netfid;

	io_parms.pid = current->tgid;

	io_parms.tcon = tcon;

	io_parms.offset = 0;
@@ -671,7 +678,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, 
		rc = CIFSSMBWrite(xid, &io_parms, &bytes_written, (char *)pdev,

				  NULL, 0);

	} /* else if (S_ISFIFO) */

	CIFSSMBClose(xid, tcon, netfid);

	CIFSSMBClose(xid, tcon, fid.netfid);

	d_drop(direntry);



	/* FIXME: add code here to set EAs */

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 


	/*

	 * Can not refresh inode by passing in file_info buf to be returned by

	 * CIFSSMBOpen and then calling get_inode_info with returned buf since

	 * ops->open and then calling get_inode_info with returned buf since

	 * file might have write behind data that needs to be flushed and server

	 * version of file size can be stale. If we knew for sure that inode was

	 * not dirty locally we could do this.