On Fri, Feb 09, 2018 at 11:11:43AM -0500, Brian Foster wrote:
> On Thu, Feb 01, 2018 at 05:42:00PM +1100, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@xxxxxxxxxx>
> >
> > When growfs changes the imaxpct value of the filesystem, it runs
> > through all the "change size" growfs code, whether it needs to or
> > not. Separate out changing imaxpct into it's own function and
> > transaction to simplify the rest of the growfs code.
> >
> > Signed-Off-By: Dave Chinner <dchinner@xxxxxxxxxx>
> > ---
> > fs/xfs/xfs_fsops.c | 67 +++++++++++++++++++++++++++++++++++++++---------------
> > 1 file changed, 49 insertions(+), 18 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> > index 94650b7d517e..5c844e540320 100644
> > --- a/fs/xfs/xfs_fsops.c
> > +++ b/fs/xfs/xfs_fsops.c
> ...
> > @@ -673,25 +661,68 @@ xfs_growfs_log_private(
> ...
> > int
> > xfs_growfs_data(
> > - xfs_mount_t *mp,
> > - xfs_growfs_data_t *in)
> > + struct xfs_mount *mp,
> > + struct xfs_growfs_data *in)
> > {
> > - int error;
> > + int error = 0;
> >
> > if (!capable(CAP_SYS_ADMIN))
> > return -EPERM;
> > if (!mutex_trylock(&mp->m_growlock))
> > return -EWOULDBLOCK;
> > +
> > + /* update imaxpct seperately to the physical grow of the filesystem */
>
> separately
>
> > + if (in->imaxpct != mp->m_sb.sb_imax_pct) {
> > + error = xfs_growfs_imaxpct(mp, in->imaxpct);
> > + if (error)
> > + goto out_error;
> > + }
> > +
> > error = xfs_growfs_data_private(mp, in);
> > + if (error)
> > + goto out_error;
>
> The 'xfs_growfs -m <maxpct>' use case typically doesn't involve a size
> change. With this change, there's no reason to run through
> xfs_growfs_data_private() if in.newblocks == mp->m_sb.sb_dblocks, right?
Yeah, we can probably do that. I hadn't done that because those
checks (and much more complex ones like a runt last AG) were
already in the xfs_growfs_data_private() code.
> Otherwise this seems fine.
Thanks!
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
