4 files changed, 29 insertions, 21 deletions

diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index dbd91461853c..05c9da6181c3 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -8,7 +8,8 @@ of second share to disconnected server session (autoreconnect on this).
 Add ability to modify cifs acls for handling chmod (when mounted with
 cifsacl flag). Fix prefixpath path separator so we can handle mounts
 with prefixpaths longer than one directory (one path component) when
-mounted to Windows servers.
+mounted to Windows servers.  Fix slow file open when cifsacl
+enabled.
 
 Version 1.51
 ------------
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 1cb5b0a9f2ac..e99d4faf5f02 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -516,7 +516,7 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len,
 
 /* Convert permission bits from mode to equivalent CIFS ACL */
 static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
-                                int acl_len, struct inode *inode, __u64 nmode)
+                                struct inode *inode, __u64 nmode)
 {
         int rc = 0;
         __u32 dacloffset;
@@ -692,14 +692,14 @@ void acl_to_uid_mode(struct inode *inode, const char *path, const __u16 *pfid)
 int mode_to_acl(struct inode *inode, const char *path, __u64 nmode)
 {
         int rc = 0;
-        __u32 acllen = 0;
+        __u32 secdesclen = 0;
         struct cifs_ntsd *pntsd = NULL; /* acl obtained from server */
         struct cifs_ntsd *pnntsd = NULL; /* modified acl to be sent to server */
 
         cFYI(DBG2, ("set ACL from mode for %s", path));
 
         /* Get the security descriptor */
-        pntsd = get_cifs_acl(&acllen, inode, path, NULL);
+        pntsd = get_cifs_acl(&secdesclen, inode, path, NULL);
 
         /* Add three ACEs for owner, group, everyone getting rid of
            other ACEs as chmod disables ACEs and set the security descriptor */
@@ -709,20 +709,22 @@ int mode_to_acl(struct inode *inode, const char *path, __u64 nmode)
                    set security descriptor request security descriptor
                    parameters, and secuirty descriptor itself */
 
-                pnntsd = kmalloc(acllen, GFP_KERNEL);
+                secdesclen = secdesclen < DEFSECDESCLEN ?
+                                        DEFSECDESCLEN : secdesclen;
+                pnntsd = kmalloc(secdesclen, GFP_KERNEL);
                 if (!pnntsd) {
                         cERROR(1, ("Unable to allocate security descriptor"));
                         kfree(pntsd);
                         return (-ENOMEM);
                 }
 
-                rc = build_sec_desc(pntsd, pnntsd, acllen, inode, nmode);
+                rc = build_sec_desc(pntsd, pnntsd, inode, nmode);
 
                 cFYI(DBG2, ("build_sec_desc rc: %d", rc));
 
                 if (!rc) {
                         /* Set the security descriptor */
-                        rc = set_cifs_acl(pnntsd, acllen, inode, path);
+                        rc = set_cifs_acl(pnntsd, secdesclen, inode, path);
                         cFYI(DBG2, ("set_cifs_acl rc: %d", rc));
                 }
 
diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index 93a7c3462ea2..6c8096cf5155 100644
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -27,6 +27,7 @@
 #define NUM_SUBAUTHS 5 /* number of sub authority fields */
 #define NUM_WK_SIDS 7 /* number of well known sids */
 #define SIDNAMELENGTH 20 /* long enough for the ones we care about */
+#define DEFSECDESCLEN 192 /* sec desc len contaiting a dacl with three aces */
 
 #define READ_BIT        0x4
 #define WRITE_BIT       0x2
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 30bbe448e260..4728fa982a4e 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -165,17 +165,19 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                                 rc = CIFSTCon(0, tcon->ses, tcon->treeName,
                                               tcon, nls_codepage);
                                 up(&tcon->ses->sesSem);
-                                /* tell server which Unix caps we support */
-                                if (tcon->ses->capabilities & CAP_UNIX)
-                                        reset_cifs_unix_caps(0 /* no xid */,
-                                                tcon,
-                                                NULL /* we do not know sb */,
-                                                NULL /* no vol info */);
                                 /* BB FIXME add code to check if wsize needs
                                    update due to negotiated smb buffer size
                                    shrinking */
-                                if (rc == 0)
+                                if (rc == 0) {
                                         atomic_inc(&tconInfoReconnectCount);
+                                        /* tell server Unix caps we support */
+                                        if (tcon->ses->capabilities & CAP_UNIX)
+                                                reset_cifs_unix_caps(
+                                                0 /* no xid */,
+                                                tcon,
+                                                NULL /* we do not know sb */,
+                                                NULL /* no vol info */);
+                                }
 
                                 cFYI(1, ("reconnect tcon rc = %d", rc));
                                 /* Removed call to reopen open files here.
@@ -310,17 +312,19 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
                                 rc = CIFSTCon(0, tcon->ses, tcon->treeName,
                                               tcon, nls_codepage);
                                 up(&tcon->ses->sesSem);
-                                /* tell server which Unix caps we support */
-                                if (tcon->ses->capabilities & CAP_UNIX)
-                                        reset_cifs_unix_caps(0 /* no xid */,
-                                                tcon,
-                                                NULL /* do not know sb */,
-                                                NULL /* no vol info */);
                                 /* BB FIXME add code to check if wsize needs
                                 update due to negotiated smb buffer size
                                 shrinking */
-                                if (rc == 0)
+                                if (rc == 0) {
                                         atomic_inc(&tconInfoReconnectCount);
+                                        /* tell server Unix caps we support */
+                                        if (tcon->ses->capabilities & CAP_UNIX)
+                                                reset_cifs_unix_caps(
+                                                0 /* no xid */,
+                                                tcon,
+                                                NULL /* do not know sb */,
+                                                NULL /* no vol info */);
+                                }
 
                                 cFYI(1, ("reconnect tcon rc = %d", rc));
                                 /* Removed call to reopen open files here.