From 1bc055d74c81b5477e6ce75f09c46eb44c6582af Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 10 Feb 2012 12:14:27 -0800 Subject: [PATCH] --- yaml --- r: 327320 b: refs/heads/master c: 61293ee2749bc2414725da37e50308154ff91574 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/squashfs/inode.c | 8 ++++++-- trunk/init/Kconfig | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 32a241355f19..8773fbde4255 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df814654f364369dfb2fe3c870f3544ce69aa78c +refs/heads/master: 61293ee2749bc2414725da37e50308154ff91574 diff --git a/trunk/fs/squashfs/inode.c b/trunk/fs/squashfs/inode.c index 81afbccfa843..a1ce5ce60632 100644 --- a/trunk/fs/squashfs/inode.c +++ b/trunk/fs/squashfs/inode.c @@ -56,16 +56,20 @@ 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; diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 8b11f2908c25..d88f945fa610 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -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