userns: Convert squashfs to use kuid/kgid where appropriate
Eric W. Biederman [Fri, 10 Feb 2012 20:14:27 +0000 (12:14 -0800)]
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

fs/squashfs/inode.c
init/Kconfig

index 81afbcc..a1ce5ce 100644 (file)
 static int squashfs_new_inode(struct super_block *sb, struct inode *inode,
                                struct squashfs_base_inode *sqsh_ino)
 {
+       uid_t i_uid;
+       gid_t i_gid;
        int err;
 
-       err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &inode->i_uid);
+       err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &i_uid);
        if (err)
                return err;
 
-       err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &inode->i_gid);
+       err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &i_gid);
        if (err)
                return err;
 
+       i_uid_write(inode, i_uid);
+       i_gid_write(inode, i_gid);
        inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);
        inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime);
        inode->i_atime.tv_sec = inode->i_mtime.tv_sec;
index 8b11f29..d88f945 100644 (file)
@@ -939,7 +939,6 @@ config UIDGID_CONVERTED
        depends on NFSD = n
        depends on NFS_FS = n
        depends on OCFS2_FS = n
-       depends on SQUASHFS = n
        depends on UBIFS_FS = n
        depends on UDF_FS = n
        depends on UFS_FS = n