From b2ce411d33bb00c2fafa45f392a507a97c2aa1ca Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@maxwell.aristanetworks.com>
Date: Fri, 20 Nov 2009 16:08:58 -0800
Subject: [PATCH] --- yaml --- r: 175030 b: refs/heads/master c:
 e16acb503b42ef241a9396de7c5a1614c74d8ca6 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/sysfs/inode.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 46488ce8ebaf..8bb9d37cb9dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca1bab38195d66bdf42320a99cc7359434a271d3
+refs/heads/master: e16acb503b42ef241a9396de7c5a1614c74d8ca6
diff --git a/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index 9f783d4e4b51..220b758523ae 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/fs/sysfs/inode.c
@@ -117,10 +117,6 @@ int sysfs_setattr(struct dentry *dentry, struct iattr *iattr)
 		return error;
 
 	iattr->ia_valid &= ~ATTR_SIZE; /* ignore size changes */
-	if (iattr->ia_valid & ATTR_MODE) {
-		if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
-			iattr->ia_mode &= ~S_ISGID;
-	}
 
 	error = inode_setattr(inode, iattr);
 	if (error)