From: Steve French <sfrench@us.ibm.com>
Date: Tue, 29 Apr 2008 20:15:43 +0000 (+0000)
Subject: [CIFS] Remove duplicate call to mode_to_acl
X-Git-Tag: v2.6.26-rc2~13^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1ec9eceabe0c90d12116871f692263b69d476d;p=linux-2.6

[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>
---

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 8eaa9e72fe..a1f24bdb65 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) {