]> err.no Git - linux-2.6/commitdiff
[CIFS] Remove duplicate call to mode_to_acl
authorSteve French <sfrench@us.ibm.com>
Tue, 29 Apr 2008 20:15:43 +0000 (20:15 +0000)
committerSteve French <sfrench@us.ibm.com>
Tue, 29 Apr 2008 20:15:43 +0000 (20:15 +0000)
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 <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/inode.c

index 8eaa9e72fe8e6ad1b07c7c481da1ff661b8a09c3..a1f24bdb656dc9d6243f5bcf7a04d2903d87cbad 100644 (file)
@@ -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) {