hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: replace xfs_qm_get_rtblks with a direct call to xfs_bmap_count_leaves 

Use the existing functionality instead of directly poking into the extent
list.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2017-08-29 15:44:14 -07:00 committed by Darrick J. Wong
parent e17a5c6f0e
commit 8bfadd8d03
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fs/xfs/xfs_qm.c
View File

@ -31,6 +31,7 @@
#include "xfs_error.h" #include "xfs_error.h"
#include "xfs_bmap.h" #include "xfs_bmap.h"
#include "xfs_bmap_btree.h" #include "xfs_bmap_btree.h"
#include "xfs_bmap_util.h"
#include "xfs_trans.h" #include "xfs_trans.h"
#include "xfs_trans_space.h" #include "xfs_trans_space.h"
#include "xfs_qm.h" #include "xfs_qm.h"
@ -1120,31 +1121,6 @@ xfs_qm_quotacheck_dqadjust(
return 0; return 0;
} }
STATIC int
xfs_qm_get_rtblks(
xfs_inode_t *ip,
xfs_qcnt_t *O_rtblks)
{
xfs_filblks_t rtblks; /* total rt blks */
xfs_extnum_t idx; /* extent record index */
xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extnum_t nextents; /* number of extent entries */
int error;
ASSERT(XFS_IS_REALTIME_INODE(ip));
ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
if (!(ifp->if_flags & XFS_IFEXTENTS)) {
if ((error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK)))
return error;
}
rtblks = 0;
nextents = xfs_iext_count(ifp);
for (idx = 0; idx < nextents; idx++)
rtblks += xfs_bmbt_get_blockcount(xfs_iext_get_ext(ifp, idx));
*O_rtblks = (xfs_qcnt_t)rtblks;
return 0;
}
/* /*
* callback routine supplied to bulkstat(). Given an inumber, find its * callback routine supplied to bulkstat(). Given an inumber, find its
* dquots and update them to account for resources taken by that inode. * dquots and update them to account for resources taken by that inode.
@ -1160,7 +1136,8 @@ xfs_qm_dqusage_adjust(
int *res) /* result code value */ int *res) /* result code value */
{ {
xfs_inode_t *ip; xfs_inode_t *ip;
xfs_qcnt_t nblks, rtblks = 0; xfs_qcnt_t nblks;
xfs_filblks_t rtblks = 0; /* total rt blks */
int error; int error;
ASSERT(XFS_IS_QUOTA_RUNNING(mp)); ASSERT(XFS_IS_QUOTA_RUNNING(mp));
@ -1190,12 +1167,15 @@ xfs_qm_dqusage_adjust(
ASSERT(ip->i_delayed_blks == 0); ASSERT(ip->i_delayed_blks == 0);
if (XFS_IS_REALTIME_INODE(ip)) { if (XFS_IS_REALTIME_INODE(ip)) {
/* struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
* Walk thru the extent list and count the realtime blocks.
*/ if (!(ifp->if_flags & XFS_IFEXTENTS)) {
error = xfs_qm_get_rtblks(ip, &rtblks); error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK);
if (error) if (error)
goto error0; goto error0;
}
xfs_bmap_count_leaves(ifp, &rtblks);
} }
nblks = (xfs_qcnt_t)ip->i_d.di_nblocks - rtblks; nblks = (xfs_qcnt_t)ip->i_d.di_nblocks - rtblks;