From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id AEA8729DF7 for ; Thu, 29 Jan 2015 09:35:50 -0600 (CST) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 4A432AC005 for ; Thu, 29 Jan 2015 07:35:50 -0800 (PST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id IviWWEmGLpGRhWKz (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 29 Jan 2015 07:35:49 -0800 (PST) Date: Thu, 29 Jan 2015 10:35:37 -0500 From: Brian Foster Subject: Re: [PATCH 8/9] xfs; factor projid hint checking out of xfs_ioctl_setattr Message-ID: <20150129153537.GH17652@laptop.bfoster> References: <1422328486-24661-1-git-send-email-david@fromorbit.com> <1422328486-24661-9-git-send-email-david@fromorbit.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1422328486-24661-9-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Dave Chinner Cc: iustin@k1024.org, xfs@oss.sgi.com 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 > --- Reviewed-by: Brian Foster > 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@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs