From: Arve Hjønnevåg <arve@android.com>
Date: Thu, 11 Mar 2010 00:38:13 +0000 (-0800)
Subject: Revert "sysfs: Fix sysfs owner and group."
X-Git-Tag: firefly_0821_release~11626
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc136618cb23810dd3d4adfcb836b289cd528b4f;p=firefly-linux-kernel-4.4.55.git

Revert "sysfs: Fix sysfs owner and group."

This reverts commit f1f8e7cd6f796b15ed011361f09b57db796d9b4e.
---

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 753018af451f..e28cecf179f5 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -94,28 +94,30 @@ int sysfs_setattr(struct dentry * dentry, struct iattr * iattr)
 		if (!sd_attrs)
 			return -ENOMEM;
 		sd->s_iattr = sd_attrs;
-	}
-	iattrs = &sd_attrs->ia_iattr;
-
-	if (ia_valid & ATTR_UID)
-		iattrs->ia_uid = iattr->ia_uid;
-	if (ia_valid & ATTR_GID)
-		iattrs->ia_gid = iattr->ia_gid;
-	if (ia_valid & ATTR_ATIME)
-		iattrs->ia_atime = timespec_trunc(iattr->ia_atime,
-				inode->i_sb->s_time_gran);
-	if (ia_valid & ATTR_MTIME)
-		iattrs->ia_mtime = timespec_trunc(iattr->ia_mtime,
-				inode->i_sb->s_time_gran);
-	if (ia_valid & ATTR_CTIME)
-		iattrs->ia_ctime = timespec_trunc(iattr->ia_ctime,
-				inode->i_sb->s_time_gran);
-	if (ia_valid & ATTR_MODE) {
-		umode_t mode = iattr->ia_mode;
-
-		if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
-			mode &= ~S_ISGID;
-		iattrs->ia_mode = sd->s_mode = mode;
+	} else {
+		/* attributes were changed at least once in past */
+		iattrs = &sd_attrs->ia_iattr;
+
+		if (ia_valid & ATTR_UID)
+			iattrs->ia_uid = iattr->ia_uid;
+		if (ia_valid & ATTR_GID)
+			iattrs->ia_gid = iattr->ia_gid;
+		if (ia_valid & ATTR_ATIME)
+			iattrs->ia_atime = timespec_trunc(iattr->ia_atime,
+					inode->i_sb->s_time_gran);
+		if (ia_valid & ATTR_MTIME)
+			iattrs->ia_mtime = timespec_trunc(iattr->ia_mtime,
+					inode->i_sb->s_time_gran);
+		if (ia_valid & ATTR_CTIME)
+			iattrs->ia_ctime = timespec_trunc(iattr->ia_ctime,
+					inode->i_sb->s_time_gran);
+		if (ia_valid & ATTR_MODE) {
+			umode_t mode = iattr->ia_mode;
+
+			if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
+				mode &= ~S_ISGID;
+			iattrs->ia_mode = sd->s_mode = mode;
+		}
 	}
 	return error;
 }