aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/sysfs/inode.c4
-rw-r--r--init/Kconfig1
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index feb2d69396cf..907c2b3af758 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -62,8 +62,8 @@ static struct sysfs_inode_attrs *sysfs_init_inode_attrs(struct sysfs_dirent *sd)
62 62
63 /* assign default attributes */ 63 /* assign default attributes */
64 iattrs->ia_mode = sd->s_mode; 64 iattrs->ia_mode = sd->s_mode;
65 iattrs->ia_uid = 0; 65 iattrs->ia_uid = GLOBAL_ROOT_UID;
66 iattrs->ia_gid = 0; 66 iattrs->ia_gid = GLOBAL_ROOT_GID;
67 iattrs->ia_atime = iattrs->ia_mtime = iattrs->ia_ctime = CURRENT_TIME; 67 iattrs->ia_atime = iattrs->ia_mtime = iattrs->ia_ctime = CURRENT_TIME;
68 68
69 return attrs; 69 return attrs;
diff --git a/init/Kconfig b/init/Kconfig
index be587651b952..908e61cd0b0e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -952,7 +952,6 @@ config UIDGID_CONVERTED
952 depends on QNX6FS_FS = n 952 depends on QNX6FS_FS = n
953 depends on REISERFS_FS = n 953 depends on REISERFS_FS = n
954 depends on SQUASHFS = n 954 depends on SQUASHFS = n
955 depends on SYSFS = n
956 depends on SYSV_FS = n 955 depends on SYSV_FS = n
957 depends on TMPFS = n 956 depends on TMPFS = n
958 depends on UBIFS_FS = n 957 depends on UBIFS_FS = n