From f7d56d74ba5af9f34c9c2d564ba977fb71279a5c Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 10 Feb 2012 11:10:33 -0800 Subject: [PATCH] --- yaml --- r: 327284 b: refs/heads/master c: 5d4ea4da6a6fb5c91e433db4addf3bb23866d821 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/efs/inode.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d05527f4519..318f42625595 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdf8c58a3546443073cab77d07a88ee439319c19 +refs/heads/master: 5d4ea4da6a6fb5c91e433db4addf3bb23866d821 diff --git a/trunk/fs/efs/inode.c b/trunk/fs/efs/inode.c index bc84f365d75c..f3913eb2c474 100644 --- a/trunk/fs/efs/inode.c +++ b/trunk/fs/efs/inode.c @@ -97,8 +97,8 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) inode->i_mode = be16_to_cpu(efs_inode->di_mode); set_nlink(inode, be16_to_cpu(efs_inode->di_nlink)); - inode->i_uid = (uid_t)be16_to_cpu(efs_inode->di_uid); - inode->i_gid = (gid_t)be16_to_cpu(efs_inode->di_gid); + i_uid_write(inode, (uid_t)be16_to_cpu(efs_inode->di_uid)); + i_gid_write(inode, (gid_t)be16_to_cpu(efs_inode->di_gid)); inode->i_size = be32_to_cpu(efs_inode->di_size); inode->i_atime.tv_sec = be32_to_cpu(efs_inode->di_atime); inode->i_mtime.tv_sec = be32_to_cpu(efs_inode->di_mtime); diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 6120bae29aea..51084b02263f 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -941,7 +941,6 @@ config UIDGID_CONVERTED depends on CEPH_FS = n depends on CIFS = n depends on CODA_FS = n - depends on EFS_FS = n depends on EXOFS_FS = n depends on FUSE_FS = n depends on GFS2_FS = n