diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-02-26 22:43:19 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2018-02-26 22:43:19 -0600 |
| commit | 3cb68815a885ca9c39e7d288ed6f4bd026b22b9c (patch) | |
| tree | f6f8975dafb016a19e1387552729d20d39b3e26f | |
| parent | 1d3bac1f3b6b4aa8b4de1ed6a95b0440b1bcd953 (diff) | |
| download | xfsprogs-dev-3cb68815a885ca9c39e7d288ed6f4bd026b22b9c.tar.gz | |
xfs: refactor accounting updates out of xfs_bmap_btalloc
Source kernel commit: 751f3767c245f9adf4f0a4f8f04aae9ae1d675a0
Move all the inode and quota accounting updates out of xfs_bmap_btalloc
in preparation for fixing some quota accounting problems with copy on
write.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | libxfs/xfs_bmap.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index b3cd21f868..87b9b12a6c 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -3328,6 +3328,22 @@ xfs_bmap_btalloc_filestreams( return 0; } +/* Update all inode and quota accounting for the allocation we just did. */ +static void +xfs_bmap_btalloc_accounting( + struct xfs_bmalloca *ap, + struct xfs_alloc_arg *args) +{ + if (!(ap->flags & XFS_BMAPI_COWFORK)) + ap->ip->i_d.di_nblocks += args->len; + xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE); + if (ap->wasdel) + ap->ip->i_delayed_blks -= args->len; + xfs_trans_mod_dquot_byino(ap->tp, ap->ip, + ap->wasdel ? XFS_TRANS_DQ_DELBCOUNT : XFS_TRANS_DQ_BCOUNT, + args->len); +} + STATIC int xfs_bmap_btalloc( struct xfs_bmalloca *ap) /* bmap alloc argument struct */ @@ -3562,19 +3578,7 @@ xfs_bmap_btalloc( *ap->firstblock = args.fsbno; ASSERT(nullfb || fb_agno <= args.agno); ap->length = args.len; - if (!(ap->flags & XFS_BMAPI_COWFORK)) - ap->ip->i_d.di_nblocks += args.len; - xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE); - if (ap->wasdel) - ap->ip->i_delayed_blks -= args.len; - /* - * Adjust the disk quota also. This was reserved - * earlier. - */ - xfs_trans_mod_dquot_byino(ap->tp, ap->ip, - ap->wasdel ? XFS_TRANS_DQ_DELBCOUNT : - XFS_TRANS_DQ_BCOUNT, - (long) args.len); + xfs_bmap_btalloc_accounting(ap, &args); } else { ap->blkno = NULLFSBLOCK; ap->length = 0; |