On Mon, May 07, 2018 at 09:32:42AM -0700, Darrick J. Wong wrote:
> On Mon, May 07, 2018 at 09:20:28AM -0500, Eric Sandeen wrote:
> > Today, quota inodes are not checked at all in xfs_repair. (This is
> > a little odd, because xfs_check used to do it in process_quota()).
> >
> > The kernel has quota inode validation and repair routines, but it is
> > out of the ordinary for the kernel to be doing metadata repair. And
> > now that we have metadata verifiers, this also yields a surprisingly
> > noisy mount if quota inodes are corrupted, even immediately after an
> > xfs_repair.
> >
> > So this patch allows xfs_repair to fix the quota inode metadata.
> >
> > Quotacheck is still left for the kernel. After a few more releases,
> > I'll propose removing the repair calls from the kernel, and move the
> > repair functions from libxfs/ into the repair code.
> >
> > Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> > ---
> >
> > This will need a bit of adjustment when my other quota patches land
> > in 4.18, but that should be no big deal.
> >
> > diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
> > index ab195f5f..e5eb3de1 100644
> > --- a/libxfs/libxfs_priv.h
> > +++ b/libxfs/libxfs_priv.h
> > @@ -196,8 +196,6 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
> > # define barrier() __memory_barrier()
> > #endif
> >
> > -#define XFS_DQUOT_CLUSTER_SIZE_FSB (xfs_filblks_t)1
> > -
> > /* miscellaneous kernel routines not in user space */
> > #define down_read(a) ((void) 0)
> > #define up_read(a) ((void) 0)
> > diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h
> > index bb1b13a9..067475e2 100644
> > --- a/libxfs/xfs_quota_defs.h
> > +++ b/libxfs/xfs_quota_defs.h
> > @@ -30,6 +30,8 @@
> > typedef uint64_t xfs_qcnt_t;
> > typedef uint16_t xfs_qwarncnt_t;
> >
> > +#define XFS_DQUOT_CLUSTER_SIZE_FSB (xfs_filblks_t)1
>
> Requires a kernel patch, right? :)
It's already defined in the kernel in fs/xfs/xfs_qm.h.
And userspace also defines it as a private define to allow libxfs to
build:
$ git grep XFS_DQUOT_CLUSTER_SIZE_FSB
libxfs/libxfs_priv.h:#define XFS_DQUOT_CLUSTER_SIZE_FSB (xfs_filblks_t)1
libxfs/xfs_trans_resv.c: XFS_FSB_TO_B(mp, XFS_DQUOT_CLUSTER_SIZE_FSB) - 1);
libxfs/xfs_trans_space.h: XFS_DQUOT_CLUSTER_SIZE_FSB)
$
If it's going to be used outside libxfs in userspace, then it should
be lifted to a libxfs header file both in the kernel and userspace,
such as fs/xfs/xfs_quota_defs.h....
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
