diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-10 23:10:33 +0400 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 14:13:10 +0400 |
| commit | 5d4ea4da6a6fb5c91e433db4addf3bb23866d821 (patch) | |
| tree | ce078cd95229d9bddeaff7e2a8bd58d0d4b23c67 | |
| parent | cdf8c58a3546443073cab77d07a88ee439319c19 (diff) | |
| download | linux-5d4ea4da6a6fb5c91e433db4addf3bb23866d821.tar.xz | |
userns: Convert efs to use kuid/kgid where appropriate
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | fs/efs/inode.c | 4 | ||||
| -rw-r--r-- | init/Kconfig | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/efs/inode.c b/fs/efs/inode.c index bc84f365d75c..f3913eb2c474 100644 --- a/fs/efs/inode.c +++ b/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/init/Kconfig b/init/Kconfig index 6120bae29aea..51084b02263f 100644 --- a/init/Kconfig +++ b/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 |