From b24b70b339ceb1b85e568f9546fe122c9c1228c5 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 29 Apr 2008 20:15:43 +0000 Subject: [PATCH] --- yaml --- r: 96310 b: refs/heads/master c: 9b1ec9eceabe0c90d12116871f692263b69d476d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/inode.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a3e7abe2e3c..2e6ea15530d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b18f2a9c3964f7612b7403dddc1d1ba5443ae24 +refs/heads/master: 9b1ec9eceabe0c90d12116871f692263b69d476d diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 8eaa9e72fe8e..a1f24bdb656d 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/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) {