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>

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 28cca01ca9c9c2b29b20d16581c430d900101a78..c6c3f91ecf069b22f2098e7ac0f3158b62a7b05e 100644 (file)
--- 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 d9bb344140d0889cdba3916efbd18d689411d6e3..5f846b57a750734b372a9a0fd6cf37295d939ae9 100644 (file)
--- 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