diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-10 15:14:27 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 06:13:35 -0400 |
commit | 61293ee2749bc2414725da37e50308154ff91574 (patch) | |
tree | 27881ed8244a4e8cdebdc5b19c94e9a45901d341 /fs/squashfs | |
parent | df814654f364369dfb2fe3c870f3544ce69aa78c (diff) |
userns: Convert squashfs to use kuid/kgid where appropriate
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/squashfs')
-rw-r--r-- | fs/squashfs/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index 81afbccfa843..a1ce5ce60632 100644 --- a/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c | |||
@@ -56,16 +56,20 @@ | |||
56 | static int squashfs_new_inode(struct super_block *sb, struct inode *inode, | 56 | static int squashfs_new_inode(struct super_block *sb, struct inode *inode, |
57 | struct squashfs_base_inode *sqsh_ino) | 57 | struct squashfs_base_inode *sqsh_ino) |
58 | { | 58 | { |
59 | uid_t i_uid; | ||
60 | gid_t i_gid; | ||
59 | int err; | 61 | int err; |
60 | 62 | ||
61 | err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &inode->i_uid); | 63 | err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &i_uid); |
62 | if (err) | 64 | if (err) |
63 | return err; | 65 | return err; |
64 | 66 | ||
65 | err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &inode->i_gid); | 67 | err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &i_gid); |
66 | if (err) | 68 | if (err) |
67 | return err; | 69 | return err; |
68 | 70 | ||
71 | i_uid_write(inode, i_uid); | ||
72 | i_gid_write(inode, i_gid); | ||
69 | inode->i_ino = le32_to_cpu(sqsh_ino->inode_number); | 73 | inode->i_ino = le32_to_cpu(sqsh_ino->inode_number); |
70 | inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime); | 74 | inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime); |
71 | inode->i_atime.tv_sec = inode->i_mtime.tv_sec; | 75 | inode->i_atime.tv_sec = inode->i_mtime.tv_sec; |