userns: Convert the ufs filesystem to use kuid/kgid where appropriate

Cc: Evgeniy Dushistov <dushistov@mail.ru>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index dd7c89d8a1c1b728deb32c7dc541c4a6e136711c..eb6d0b7dc8791bc580393dd18ea621582ab8f296 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -597,8 +597,8 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
        /*
         * Linux now has 32-bit uid and gid, so we can support EFT.
         */
-       inode->i_uid = ufs_get_inode_uid(sb, ufs_inode);
-       inode->i_gid = ufs_get_inode_gid(sb, ufs_inode);
+       i_uid_write(inode, ufs_get_inode_uid(sb, ufs_inode));
+       i_gid_write(inode, ufs_get_inode_gid(sb, ufs_inode));
 
        inode->i_size = fs64_to_cpu(sb, ufs_inode->ui_size);
        inode->i_atime.tv_sec = fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec);
@@ -645,8 +645,8 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
         /*
          * Linux now has 32-bit uid and gid, so we can support EFT.
          */
-       inode->i_uid = fs32_to_cpu(sb, ufs2_inode->ui_uid);
-       inode->i_gid = fs32_to_cpu(sb, ufs2_inode->ui_gid);
+       i_uid_write(inode, fs32_to_cpu(sb, ufs2_inode->ui_uid));
+       i_gid_write(inode, fs32_to_cpu(sb, ufs2_inode->ui_gid));
 
        inode->i_size = fs64_to_cpu(sb, ufs2_inode->ui_size);
        inode->i_atime.tv_sec = fs64_to_cpu(sb, ufs2_inode->ui_atime);
@@ -745,8 +745,8 @@ static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode)
        ufs_inode->ui_mode = cpu_to_fs16(sb, inode->i_mode);
        ufs_inode->ui_nlink = cpu_to_fs16(sb, inode->i_nlink);
 
-       ufs_set_inode_uid(sb, ufs_inode, inode->i_uid);
-       ufs_set_inode_gid(sb, ufs_inode, inode->i_gid);
+       ufs_set_inode_uid(sb, ufs_inode, i_uid_read(inode));
+       ufs_set_inode_gid(sb, ufs_inode, i_gid_read(inode));
                
        ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size);
        ufs_inode->ui_atime.tv_sec = cpu_to_fs32(sb, inode->i_atime.tv_sec);
@@ -789,8 +789,8 @@ static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode)
        ufs_inode->ui_mode = cpu_to_fs16(sb, inode->i_mode);
        ufs_inode->ui_nlink = cpu_to_fs16(sb, inode->i_nlink);
 
-       ufs_inode->ui_uid = cpu_to_fs32(sb, inode->i_uid);
-       ufs_inode->ui_gid = cpu_to_fs32(sb, inode->i_gid);
+       ufs_inode->ui_uid = cpu_to_fs32(sb, i_uid_read(inode));
+       ufs_inode->ui_gid = cpu_to_fs32(sb, i_gid_read(inode));
 
        ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size);
        ufs_inode->ui_atime = cpu_to_fs64(sb, inode->i_atime.tv_sec);

diff --git a/init/Kconfig b/init/Kconfig
index 6f9819ac322bc5208cbbb93cff32f859f8bf2d89..577916d8c9d86853e6314bdcd7e24738663f4548 100644 (file)
--- a/init/Kconfig
+++ b/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 UFS_FS = n
        depends on XFS_FS = n
 
 config UIDGID_STRICT_TYPE_CHECKS