On Fri, Dec 04, 2020 at 12:10:24AM +0800, Gao Xiang wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Introduce a helper to make the on-disk inode allocation rolling
> logic clearer in preparation of the following cleanup.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_ialloc.c | 45 ++++++++++++++++++++++++++++++++++++++
> fs/xfs/libxfs/xfs_ialloc.h | 6 +++++
> fs/xfs/xfs_inode.c | 39 +--------------------------------
> 3 files changed, 52 insertions(+), 38 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
> index 45cf7e55f5ee..d5dc3167e2ff 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.c
> +++ b/fs/xfs/libxfs/xfs_ialloc.c
> @@ -1682,6 +1682,51 @@ xfs_dialloc_ag(
> return error;
> }
>
> +int
> +xfs_dialloc_roll(
> + struct xfs_trans **tpp,
> + struct xfs_buf *agibp)
> +{
> + struct xfs_trans *tp = *tpp;
> + void *dqinfo = NULL;
struct xfs_dquot_acct instead of void?
> + unsigned int tflags = 0;
> + int error;
> +
> + /*
> + * Hold to on to the agibp across the commit so no other allocation can
> + * come in and take the free inodes we just allocated for our caller.
> + */
> + xfs_trans_bhold(tp, agibp);
> +
> + /*
> + * We want the quota changes to be associated with the next transaction,
> + * NOT this one. So, detach the dqinfo from this and attach it to the
> + * next transaction.
> + */
> + if (tp->t_dqinfo) {
> + dqinfo = tp->t_dqinfo;
Assuming Eric's ok with adding a dummy t_dqinfo to struct xfs_trans in
userspace, this seems fine to me.
--D
> + tp->t_dqinfo = NULL;
> + tflags = tp->t_flags & XFS_TRANS_DQ_DIRTY;
> + tp->t_flags &= ~(XFS_TRANS_DQ_DIRTY);
> + }
> +
> + error = xfs_trans_roll(&tp);
> +
> + /* Re-attach the quota info that we detached from prev trx. */
> + if (dqinfo) {
> + tp->t_dqinfo = dqinfo;
> + tp->t_flags |= tflags;
> + }
> +
> + *tpp = tp;
> + if (error) {
> + xfs_buf_relse(agibp);
> + return error;
> + }
> + xfs_trans_bjoin(tp, agibp);
> + return 0;
> +}
> +
> /*
> * Allocate an inode on disk.
> *
> diff --git a/fs/xfs/libxfs/xfs_ialloc.h b/fs/xfs/libxfs/xfs_ialloc.h
> index 72b3468b97b1..a145e2a72530 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.h
> +++ b/fs/xfs/libxfs/xfs_ialloc.h
> @@ -32,6 +32,12 @@ xfs_make_iptr(struct xfs_mount *mp, struct xfs_buf *b, int o)
> return xfs_buf_offset(b, o << (mp)->m_sb.sb_inodelog);
> }
>
> +/* XXX: will be removed in the following patch */
> +int
> +xfs_dialloc_roll(
> + struct xfs_trans **tpp,
> + struct xfs_buf *agibp);
> +
> /*
> * Allocate an inode on disk.
> * Mode is used to tell whether the new inode will need space, and whether
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 2bfbcf28b1bd..4ebfb1a18f0f 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -958,8 +958,6 @@ xfs_dir_ialloc(
> xfs_inode_t *ip;
> xfs_buf_t *ialloc_context = NULL;
> int code;
> - void *dqinfo;
> - uint tflags;
>
> tp = *tpp;
> ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
> @@ -1003,46 +1001,11 @@ xfs_dir_ialloc(
> * to succeed the second time.
> */
> if (ialloc_context) {
> - /*
> - * Normally, xfs_trans_commit releases all the locks.
> - * We call bhold to hang on to the ialloc_context across
> - * the commit. Holding this buffer prevents any other
> - * processes from doing any allocations in this
> - * allocation group.
> - */
> - xfs_trans_bhold(tp, ialloc_context);
> -
> - /*
> - * We want the quota changes to be associated with the next
> - * transaction, NOT this one. So, detach the dqinfo from this
> - * and attach it to the next transaction.
> - */
> - dqinfo = NULL;
> - tflags = 0;
> - if (tp->t_dqinfo) {
> - dqinfo = (void *)tp->t_dqinfo;
> - tp->t_dqinfo = NULL;
> - tflags = tp->t_flags & XFS_TRANS_DQ_DIRTY;
> - tp->t_flags &= ~(XFS_TRANS_DQ_DIRTY);
> - }
> -
> - code = xfs_trans_roll(&tp);
> -
> - /*
> - * Re-attach the quota info that we detached from prev trx.
> - */
> - if (dqinfo) {
> - tp->t_dqinfo = dqinfo;
> - tp->t_flags |= tflags;
> - }
> -
> + code = xfs_dialloc_roll(&tp, ialloc_context);
> if (code) {
> - xfs_buf_relse(ialloc_context);
> - *tpp = tp;
> *ipp = NULL;
> return code;
> }
> - xfs_trans_bjoin(tp, ialloc_context);
>
> /*
> * Call ialloc again. Since we've locked out all
> --
> 2.18.4
>
