lkml.org 
[lkml]   [2012]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 21/25] userns: Convert the qnx4 filesystem to use kuid/kgid where appropriate
On 2012-09-20 13:42:02, Eric W. Biederman wrote:
> From: "Eric W. Biederman" <ebiederm@xmission.com>
>
> Cc: Anders Larsen <al@alarsen.net>
> Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

Acked-by: Anders Larsen <al@alarsen.net>

> ---
> fs/qnx4/inode.c | 4 ++--
> init/Kconfig | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
> index 552e994..5c3c7b0 100644
> --- a/fs/qnx4/inode.c
> +++ b/fs/qnx4/inode.c
> @@ -312,8 +312,8 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)
> (ino % QNX4_INODES_PER_BLOCK);
>
> inode->i_mode = le16_to_cpu(raw_inode->di_mode);
> - inode->i_uid = (uid_t)le16_to_cpu(raw_inode->di_uid);
> - inode->i_gid = (gid_t)le16_to_cpu(raw_inode->di_gid);
> + i_uid_write(inode, (uid_t)le16_to_cpu(raw_inode->di_uid));
> + i_gid_write(inode, (gid_t)le16_to_cpu(raw_inode->di_gid));
> set_nlink(inode, le16_to_cpu(raw_inode->di_nlink));
> inode->i_size = le32_to_cpu(raw_inode->di_size);
> inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->di_mtime);
> diff --git a/init/Kconfig b/init/Kconfig
> index 390e629..b9d6be5 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -950,7 +950,6 @@ config UIDGID_CONVERTED
> depends on NFSD = n
> depends on NFS_FS = n
> depends on OCFS2_FS = n
> - depends on QNX4FS_FS = n
> depends on QNX6FS_FS = n
> depends on REISERFS_FS = n
> depends on SQUASHFS = n
> --
> 1.7.5.4



\
 
 \ /
  Last update: 2012-09-20 15:21    [W:0.544 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site