aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-02-10 11:06:08 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 03:13:08 -0700
commita7d9cfe97b450b27c82e6e41b2fde6214708560d (patch)
tree0948e4ef8324083cf96c4fcf8f344fc47adb219d
parent31aba059bb9522ff730301a7d567117fcff0952c (diff)
userns: Convert cramfs 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/cramfs/inode.c4
-rw-r--r--init/Kconfig1
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 28cca01ca9c..c6c3f91ecf0 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -90,8 +90,8 @@ static struct inode *get_cramfs_inode(struct super_block *sb,
}
inode->i_mode = cramfs_inode->mode;
- inode->i_uid = cramfs_inode->uid;
- inode->i_gid = cramfs_inode->gid;
+ i_uid_write(inode, cramfs_inode->uid);
+ i_gid_write(inode, cramfs_inode->gid);
/* if the lower 2 bits are zero, the inode contains data */
if (!(inode->i_ino & 3)) {
diff --git a/init/Kconfig b/init/Kconfig
index d9bb344140d..5f846b57a75 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 CRAMFS = n
depends on ECRYPT_FS = n
depends on EFS_FS = n
depends on EXOFS_FS = n