[CIFS] Remove duplicate call to mode_to_acl

The current logic in cifs_setattr calls mode_to_acl twice on mode
changes if cifsacl is enabled. Remove the duplicate call.

Signed-off-by: Jeff Layton <[email protected]>
CC: Shirish Pargaonkar <[email protected]>
Signed-off-by: Steve French <[email protected]>

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 8eaa9e72fe8e6ad1b07c7c481da1ff661b8a09c3..a1f24bdb656dc9d6243f5bcf7a04d2903d87cbad 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1581,10 +1581,6 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
                        if (time_buf.Attributes == 0)
                                time_buf.Attributes |= cpu_to_le32(ATTR_NORMAL);
                }
-#ifdef CONFIG_CIFS_EXPERIMENTAL
-               if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)
-                       mode_to_acl(direntry->d_inode, full_path, mode);
-#endif
        }
 
        if (attrs->ia_valid & ATTR_ATIME) {