Commit 8b1327f6 authored by Steve French's avatar Steve French
Browse files

[CIFS] file create with acl support enabled is slow 



Shirish Pargaonkar noted:
With cifsacl mount option, when a file is created on the Windows server,
exclusive oplock is broken right away because the get cifs acl code
again opens the file to obtain security descriptor.
The client does not have the newly created file handle or inode in any
of its lists yet so it does not respond to oplock break and server waits for
its duration and then responds to the second open. This slows down file
creation signficantly.  The fix is to pass the file descriptor to the get
cifsacl code wherever available so that get cifs acl code does not send
second open (NT Create ANDX) and oplock is not broken.

CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent ebe8912b

fs/cifs/cifsacl.c

+15 −10
Original line number Diff line number Diff line 
/*

 *   fs/cifs/cifsacl.c

 *

 *   Copyright (C) International Business Machines  Corp., 2007

 *   Copyright (C) International Business Machines  Corp., 2007,2008

 *   Author(s): Steve French (sfrench@us.ibm.com)

 *

 *   Contains the routines for mapping CIFS/NTFS ACLs
@@ -556,9 +556,9 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, 


/* Retrieve an ACL from the server */

static struct cifs_ntsd *get_cifs_acl(u32 *pacllen, struct inode *inode,

				       const char *path)

				       const char *path, const __u16 *pfid)

{

	struct cifsFileInfo *open_file;

	struct cifsFileInfo *open_file = NULL;

	int unlock_file = FALSE;

	int xid;

	int rc = -EIO;
@@ -573,7 +573,11 @@ static struct cifs_ntsd *get_cifs_acl(u32 *pacllen, struct inode *inode, 
		return NULL;



	xid = GetXid();

	if (pfid == NULL)

		open_file = find_readable_file(CIFS_I(inode));

	else

		fid = *pfid;



	sb = inode->i_sb;

	if (sb == NULL) {

		FreeXid(xid);
@@ -584,7 +588,7 @@ static struct cifs_ntsd *get_cifs_acl(u32 *pacllen, struct inode *inode, 
	if (open_file) {

		unlock_file = TRUE;

		fid = open_file->netfid;

	} else {

	} else if (pfid == NULL) {

		int oplock = FALSE;

		/* open file */

		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,
@@ -600,10 +604,11 @@ static struct cifs_ntsd *get_cifs_acl(u32 *pacllen, struct inode *inode, 


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

	cFYI(1, ("GetCIFSACL rc = %d ACL len %d", rc, *pacllen));

	if (unlock_file == TRUE)

	if (unlock_file == TRUE) /* find_readable_file increments ref count */

		atomic_dec(&open_file->wrtPending);

	else

	else if (pfid == NULL) /* if opened above we have to close the handle */

		CIFSSMBClose(xid, cifs_sb->tcon, fid);

	/* else handle was passed in by caller */



	FreeXid(xid);

	return pntsd;
@@ -664,14 +669,14 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
}



/* Translate the CIFS ACL (simlar to NTFS ACL) for a file into mode bits */

void acl_to_uid_mode(struct inode *inode, const char *path)

void acl_to_uid_mode(struct inode *inode, const char *path, const __u16 *pfid)

{

	struct cifs_ntsd *pntsd = NULL;

	u32 acllen = 0;

	int rc = 0;



	cFYI(DBG2, ("converting ACL to mode for %s", path));

	pntsd = get_cifs_acl(&acllen, inode, path);

	pntsd = get_cifs_acl(&acllen, inode, path, pfid);



	/* if we can retrieve the ACL, now parse Access Control Entries, ACEs */

	if (pntsd)
@@ -694,7 +699,7 @@ int mode_to_acl(struct inode *inode, const char *path, __u64 nmode) 
	cFYI(DBG2, ("set ACL from mode for %s", path));



	/* Get the security descriptor */

	pntsd = get_cifs_acl(&acllen, inode, path);

	pntsd = get_cifs_acl(&acllen, inode, path, NULL);



	/* Add three ACEs for owner, group, everyone getting rid of

	   other ACEs as chmod disables ACEs and set the security descriptor */

fs/cifs/cifsproto.h

+3 −2
Original line number Diff line number Diff line
@@ -92,11 +92,12 @@ extern struct timespec cnvrtDosUnixTm(__u16 date, __u16 time); 
extern int cifs_get_inode_info(struct inode **pinode,

			const unsigned char *search_path,

			FILE_ALL_INFO * pfile_info,

			struct super_block *sb, int xid);

			struct super_block *sb, int xid, const __u16 *pfid);

extern int cifs_get_inode_info_unix(struct inode **pinode,

			const unsigned char *search_path,

			struct super_block *sb, int xid);

extern void acl_to_uid_mode(struct inode *inode, const char *search_path);

extern void acl_to_uid_mode(struct inode *inode, const char *path,

			    const __u16 *pfid);

extern int mode_to_acl(struct inode *inode, const char *path, __u64);



extern int cifs_mount(struct super_block *, struct cifs_sb_info *, char *,

fs/cifs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
						 inode->i_sb, xid);

		else {

			rc = cifs_get_inode_info(&newinode, full_path,

						 buf, inode->i_sb, xid);

						 buf, inode->i_sb, xid,

						 &fileHandle);

			if (newinode) {

				newinode->i_mode = mode;

				if ((oplock & CIFS_CREATE_ACTION) &&
@@ -483,7 +484,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
					      parent_dir_inode->i_sb, xid);

	else

		rc = cifs_get_inode_info(&newInode, full_path, NULL,

					 parent_dir_inode->i_sb, xid);

					 parent_dir_inode->i_sb, xid, NULL);



	if ((rc == 0) && (newInode != NULL)) {

		if (pTcon->nocase)

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ client_can_cache: 
			full_path, inode->i_sb, xid);

	else

		rc = cifs_get_inode_info(&file->f_path.dentry->d_inode,

			full_path, buf, inode->i_sb, xid);

			full_path, buf, inode->i_sb, xid, NULL);



	if ((*oplock & 0xF) == OPLOCK_EXCLUSIVE) {

		pCifsInode->clientCanCacheAll = TRUE;
@@ -440,7 +440,7 @@ reopen_error_exit: 
				else

					rc = cifs_get_inode_info(&inode,

						full_path, NULL, inode->i_sb,

						xid);

						xid, NULL);

			} /* else we are writing out data to server already

			     and could deadlock if we tried to flush data, and

			     since we do not know if we have data that would

fs/cifs/inode.c

+6 −5
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int get_sfu_mode(struct inode *inode, 


int cifs_get_inode_info(struct inode **pinode,

	const unsigned char *search_path, FILE_ALL_INFO *pfindData,

	struct super_block *sb, int xid)

	struct super_block *sb, int xid, const __u16 *pfid)

{

	int rc = 0;

	struct cifsTconInfo *pTcon;
@@ -569,7 +569,7 @@ try_again_CIFSSMBQPathInfo: 
		/* fill in 0777 bits from ACL */

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {

			cFYI(1, ("Getting mode bits from ACL"));

			acl_to_uid_mode(inode, search_path);

			acl_to_uid_mode(inode, search_path, pfid);

		}

#endif

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) {
@@ -616,7 +616,8 @@ struct inode *cifs_iget(struct super_block *sb, unsigned long ino) 
	if (cifs_sb->tcon->unix_ext)

		rc = cifs_get_inode_info_unix(&inode, "", inode->i_sb, xid);

	else

		rc = cifs_get_inode_info(&inode, "", NULL, inode->i_sb, xid);

		rc = cifs_get_inode_info(&inode, "", NULL, inode->i_sb, xid,

					 NULL);

	if (rc && cifs_sb->tcon->ipc) {

		cFYI(1, ("ipc connection - fake read inode"));

		inode->i_mode |= S_IFDIR;
@@ -949,7 +950,7 @@ mkdir_get_info: 
						      inode->i_sb, xid);

		else

			rc = cifs_get_inode_info(&newinode, full_path, NULL,

						 inode->i_sb, xid);

						 inode->i_sb, xid, NULL);



		if (pTcon->nocase)

			direntry->d_op = &cifs_ci_dentry_ops;
@@ -1231,7 +1232,7 @@ int cifs_revalidate(struct dentry *direntry) 
		}

	} else {

		rc = cifs_get_inode_info(&direntry->d_inode, full_path, NULL,

					 direntry->d_sb, xid);

					 direntry->d_sb, xid, NULL);

		if (rc) {

			cFYI(1, ("error on getting revalidate info %d", rc));

/*			if (rc != -ENOENT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE