xfs
[Top] [All Lists]

Re: [PATCH 8/9] xfs; factor projid hint checking out of xfs_ioctl_setatt

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: [PATCH 8/9] xfs; factor projid hint checking out of xfs_ioctl_setattr
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Thu, 29 Jan 2015 10:35:37 -0500
Cc: xfs@xxxxxxxxxxx, iustin@xxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1422328486-24661-9-git-send-email-david@xxxxxxxxxxxxx>
References: <1422328486-24661-1-git-send-email-david@xxxxxxxxxxxxx> <1422328486-24661-9-git-send-email-david@xxxxxxxxxxxxx>
User-agent: Mutt/1.5.23 (2014-03-12)
On Tue, Jan 27, 2015 at 02:14:45PM +1100, Dave Chinner wrote:
> The project ID change checking is one of the few remaining open
> coded checks in xfs_ioctl_setattr(). Factor it into a helper
> function so that the setattr code mostly becomes a flow of check
> and action helpers, making it easier to read and follow.
> 
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

>  fs/xfs/xfs_ioctl.c | 50 +++++++++++++++++++++++++++++++-------------------
>  1 file changed, 31 insertions(+), 19 deletions(-)
> 
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 7e42d0f..561d142 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1142,6 +1142,34 @@ xfs_ioctl_setattr_check_extsize(
>       return 0;
>  }
>  
> +int
> +xfs_ioctl_setattr_check_projid(
> +     struct xfs_inode        *ip,
> +     struct fsxattr          *fa)
> +{
> +     /* Disallow 32bit project ids if projid32bit feature is not enabled. */
> +     if (fa->fsx_projid > (__uint16_t)-1 &&
> +         !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
> +             return -EINVAL;
> +
> +     /*
> +      * Project Quota ID state is only allowed to change from within the init
> +      * namespace. Enforce that restriction only if we are trying to change
> +      * the quota ID state. Everything else is allowed in user namespaces.
> +      */
> +     if (current_user_ns() == &init_user_ns)
> +             return 0;
> +
> +     if (xfs_get_projid(ip) != fa->fsx_projid)
> +             return -EINVAL;
> +     if ((fa->fsx_xflags & XFS_XFLAG_PROJINHERIT) ^
> +         (ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT))
> +             return -EINVAL;
> +
> +     return 0;
> +}
> +
> +
>  
>  STATIC int
>  xfs_ioctl_setattr(
> @@ -1157,25 +1185,9 @@ xfs_ioctl_setattr(
>  
>       trace_xfs_ioctl_setattr(ip);
>  
> -     /*
> -      * Disallow 32bit project ids when projid32bit feature is not enabled.
> -      */
> -     if (fa->fsx_projid > (__uint16_t)-1 &&
> -         !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
> -             return -EINVAL;
> -
> -     /*
> -      * Project Quota ID state is only allowed to change from within the init
> -      * namespace. Enforce that restriction only if we are trying to change
> -      * the quota ID state. Everything else is allowed in user namespaces.
> -      */
> -     if (current_user_ns() != &init_user_ns) {
> -             if (xfs_get_projid(ip) != fa->fsx_projid)
> -                     return -EINVAL;
> -             if ((fa->fsx_xflags & XFS_XFLAG_PROJINHERIT) ^
> -                 (ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT))
> -                     return -EINVAL;
> -     }
> +     code = xfs_ioctl_setattr_check_projid(ip, fa);
> +     if (code)
> +             return code;
>  
>       /*
>        * If disk quotas is on, we make sure that the dquots do exist on disk,
> -- 
> 2.0.0
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

<Prev in Thread] Current Thread [Next in Thread>