---

yaml --- r: 96310 b: refs/heads/master c: 9b1ec9e h: refs/heads/master v: v3
git-mirror · Apr 29, 2008 · b24b70b · b24b70b
1 parent ec01724
commit b24b70b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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) {