From 9b1ec9eceabe0c90d12116871f692263b69d476d Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 29 Apr 2008 20:15:43 +0000 Subject: [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 CC: Shirish Pargaonkar Signed-off-by: Steve French --- fs/cifs/inode.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'fs/cifs') diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 8eaa9e72fe8..a1f24bdb656 100644 --- 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) { -- cgit v1.2.3