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>

diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 9870417c26e7c43852f98b3d641445b5a94c40b1..b242beba58edcd35c41dea3ecf86ee1181be97db 100644 (file)
--- 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 a358f4acdc4292753ee1137ce7ade59414720382..fd91d2b638751409a42ae621db9b2f7101f1933a 100644 (file)
--- 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