[PATCH 12/25] userns: Convert exofs to use kuid/kgid where appropriate

[Boaz Harrosh]

On 09/20/2012 02:41 PM, Eric W. Biederman wrote:

> From: "Eric W. Biederman" <ebiederm at xmission.com>
> 
> Cc: Boaz Harrosh <bharrosh at panasas.com>
> Cc: Benny Halevy <bhalevy at tonian.com>
> Acked-by: Serge Hallyn <serge.hallyn at canonical.com>


Acked-by: Boaz Harrosh <bharrosh at panasas.com>

> Signed-off-by: Eric W. Biederman <ebiederm at xmission.com>
> ---
>  fs/exofs/inode.c |    8 ++++----
>  init/Kconfig     |    1 -
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
> index 5badb0c..190c3d6 100644
> --- a/fs/exofs/inode.c
> +++ b/fs/exofs/inode.c
> @@ -1163,8 +1163,8 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
>  
>  	/* copy stuff from on-disk struct to in-memory struct */
>  	inode->i_mode = le16_to_cpu(fcb.i_mode);
> -	inode->i_uid = le32_to_cpu(fcb.i_uid);
> -	inode->i_gid = le32_to_cpu(fcb.i_gid);
> +	i_uid_write(inode, le32_to_cpu(fcb.i_uid));
> +	i_gid_write(inode, le32_to_cpu(fcb.i_gid));
>  	set_nlink(inode, le16_to_cpu(fcb.i_links_count));
>  	inode->i_ctime.tv_sec = (signed)le32_to_cpu(fcb.i_ctime);
>  	inode->i_atime.tv_sec = (signed)le32_to_cpu(fcb.i_atime);
> @@ -1376,8 +1376,8 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
>  	fcb = &args->fcb;
>  
>  	fcb->i_mode = cpu_to_le16(inode->i_mode);
> -	fcb->i_uid = cpu_to_le32(inode->i_uid);
> -	fcb->i_gid = cpu_to_le32(inode->i_gid);
> +	fcb->i_uid = cpu_to_le32(i_uid_read(inode));
> +	fcb->i_gid = cpu_to_le32(i_gid_read(inode));
>  	fcb->i_links_count = cpu_to_le16(inode->i_nlink);
>  	fcb->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
>  	fcb->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
> diff --git a/init/Kconfig b/init/Kconfig
> index 51084b0..39e55d6 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -941,7 +941,6 @@ config UIDGID_CONVERTED
>  	depends on CEPH_FS = n
>  	depends on CIFS = n
>  	depends on CODA_FS = n
> -	depends on EXOFS_FS = n
>  	depends on FUSE_FS = n
>  	depends on GFS2_FS = n
>  	depends on HFS_FS = n