diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-29 20:15:43 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-29 20:15:43 +0000 |
| commit | 9b1ec9eceabe0c90d12116871f692263b69d476d (patch) | |
| tree | 2c6dcd244a7874ed18b049dec176dbf61fa922f9 | |
| parent | 4b18f2a9c3964f7612b7403dddc1d1ba5443ae24 (diff) | |
| download | lwn-9b1ec9eceabe0c90d12116871f692263b69d476d.tar.gz lwn-9b1ec9eceabe0c90d12116871f692263b69d476d.zip | |
[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.c | 4 |
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) 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) { |