diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-25 03:57:31 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 03:13:31 -0700 |
| commit | 7f5b82b835ee62b365f39373e35162eb7a072c5f (patch) | |
| tree | f4fce18bfc774bb0a47120394efe252d25e0e46c | |
| parent | 8fed10be0029acda5564f03b9cc1fc4cb7470bae (diff) | |
| download | linux-3.10-7f5b82b835ee62b365f39373e35162eb7a072c5f.tar.gz linux-3.10-7f5b82b835ee62b365f39373e35162eb7a072c5f.tar.bz2 linux-3.10-7f5b82b835ee62b365f39373e35162eb7a072c5f.zip | |
userns: Convert bfs to use kuid/kgid where appropriate
Cc: "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | fs/bfs/inode.c | 8 | ||||
| -rw-r--r-- | init/Kconfig | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 9870417c26e..b242beba58e 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c @@ -76,8 +76,8 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino) BFS_I(inode)->i_sblock = le32_to_cpu(di->i_sblock); BFS_I(inode)->i_eblock = le32_to_cpu(di->i_eblock); BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino); - inode->i_uid = le32_to_cpu(di->i_uid); - inode->i_gid = le32_to_cpu(di->i_gid); + i_uid_write(inode, le32_to_cpu(di->i_uid)); + i_gid_write(inode, le32_to_cpu(di->i_gid)); set_nlink(inode, le32_to_cpu(di->i_nlink)); inode->i_size = BFS_FILESIZE(di); inode->i_blocks = BFS_FILEBLOCKS(di); @@ -139,8 +139,8 @@ static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc) di->i_ino = cpu_to_le16(ino); di->i_mode = cpu_to_le32(inode->i_mode); - di->i_uid = cpu_to_le32(inode->i_uid); - di->i_gid = cpu_to_le32(inode->i_gid); + di->i_uid = cpu_to_le32(i_uid_read(inode)); + di->i_gid = cpu_to_le32(i_gid_read(inode)); di->i_nlink = cpu_to_le32(inode->i_nlink); di->i_atime = cpu_to_le32(inode->i_atime.tv_sec); di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec); diff --git a/init/Kconfig b/init/Kconfig index a358f4acdc4..fd91d2b6387 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -930,7 +930,6 @@ config UIDGID_CONVERTED depends on 9P_FS = n depends on AFS_FS = n depends on AUTOFS4_FS = n - depends on BFS_FS = n depends on BTRFS_FS = n depends on CEPH_FS = n depends on CIFS = n |