aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-04-29 16:15:43 -0400
committerSteve French <sfrench@us.ibm.com>2008-04-29 16:15:43 -0400
commit9b1ec9eceabe0c90d12116871f692263b69d476d (patch)
tree2c6dcd244a7874ed18b049dec176dbf61fa922f9
parent4b18f2a9c3964f7612b7403dddc1d1ba5443ae24 (diff)
[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 <jlayton@redhat.com> CC: Shirish Pargaonkar <shirishp@us.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/inode.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 8eaa9e72fe8e..a1f24bdb656d 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1581,10 +1581,6 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
1581 if (time_buf.Attributes == 0) 1581 if (time_buf.Attributes == 0)
1582 time_buf.Attributes |= cpu_to_le32(ATTR_NORMAL); 1582 time_buf.Attributes |= cpu_to_le32(ATTR_NORMAL);
1583 } 1583 }
1584#ifdef CONFIG_CIFS_EXPERIMENTAL
1585 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)
1586 mode_to_acl(direntry->d_inode, full_path, mode);
1587#endif
1588 } 1584 }
1589 1585
1590 if (attrs->ia_valid & ATTR_ATIME) { 1586 if (attrs->ia_valid & ATTR_ATIME) {