From bfad85172879e26beffeacb5020e87b3d361bca6 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 7 Feb 2012 16:28:09 -0800 Subject: [PATCH] --- yaml --- r: 327265 b: refs/heads/master c: 69552c0c50f3f950f304fb07a4320e46f7f60c21 h: refs/heads/master i: 327263: 0aee51d73f54c55a55323452c04fcac9e23376c8 v: v3 --- [refs] | 2 +- trunk/fs/configfs/inode.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 369313bf4a46..cbe7ac231053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af84df93ffe3603fc6fc40a4338f9e740aad3b4e +refs/heads/master: 69552c0c50f3f950f304fb07a4320e46f7f60c21 diff --git a/trunk/fs/configfs/inode.c b/trunk/fs/configfs/inode.c index 0074362d9f7f..a9d35b0e06cf 100644 --- a/trunk/fs/configfs/inode.c +++ b/trunk/fs/configfs/inode.c @@ -79,8 +79,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr) return -ENOMEM; /* assign default attributes */ sd_iattr->ia_mode = sd->s_mode; - sd_iattr->ia_uid = 0; - sd_iattr->ia_gid = 0; + sd_iattr->ia_uid = GLOBAL_ROOT_UID; + sd_iattr->ia_gid = GLOBAL_ROOT_GID; sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME; sd->s_iattr = sd_iattr; } diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index ed6310b6042b..33d231cd3cc6 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -950,7 +950,6 @@ config UIDGID_CONVERTED depends on CEPH_FS = n depends on CIFS = n depends on CODA_FS = n - depends on CONFIGFS_FS = n depends on CRAMFS = n depends on ECRYPT_FS = n depends on EFS_FS = n