mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-24 06:44:23 +08:00
xfs: refactor quotacheck flags usage
We only use the XFS_QMOPT flags in quotacheck to signal the quota type, so rip out all the flags handling and just pass the type all the way through. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
This commit is contained in:
parent
41ed4a5f2b
commit
0dcc0728c1
@ -902,17 +902,13 @@ xfs_qm_reset_dqcounts_all(
|
|||||||
xfs_dqid_t firstid,
|
xfs_dqid_t firstid,
|
||||||
xfs_fsblock_t bno,
|
xfs_fsblock_t bno,
|
||||||
xfs_filblks_t blkcnt,
|
xfs_filblks_t blkcnt,
|
||||||
uint flags,
|
uint type,
|
||||||
struct list_head *buffer_list)
|
struct list_head *buffer_list)
|
||||||
{
|
{
|
||||||
struct xfs_buf *bp;
|
struct xfs_buf *bp;
|
||||||
int error;
|
int error = 0;
|
||||||
int type;
|
|
||||||
|
|
||||||
ASSERT(blkcnt > 0);
|
ASSERT(blkcnt > 0);
|
||||||
type = flags & XFS_QMOPT_UQUOTA ? XFS_DQ_USER :
|
|
||||||
(flags & XFS_QMOPT_PQUOTA ? XFS_DQ_PROJ : XFS_DQ_GROUP);
|
|
||||||
error = 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Blkcnt arg can be a very big number, and might even be
|
* Blkcnt arg can be a very big number, and might even be
|
||||||
@ -972,7 +968,7 @@ STATIC int
|
|||||||
xfs_qm_reset_dqcounts_buf(
|
xfs_qm_reset_dqcounts_buf(
|
||||||
struct xfs_mount *mp,
|
struct xfs_mount *mp,
|
||||||
struct xfs_inode *qip,
|
struct xfs_inode *qip,
|
||||||
uint flags,
|
uint type,
|
||||||
struct list_head *buffer_list)
|
struct list_head *buffer_list)
|
||||||
{
|
{
|
||||||
struct xfs_bmbt_irec *map;
|
struct xfs_bmbt_irec *map;
|
||||||
@ -1048,7 +1044,7 @@ xfs_qm_reset_dqcounts_buf(
|
|||||||
error = xfs_qm_reset_dqcounts_all(mp, firstid,
|
error = xfs_qm_reset_dqcounts_all(mp, firstid,
|
||||||
map[i].br_startblock,
|
map[i].br_startblock,
|
||||||
map[i].br_blockcount,
|
map[i].br_blockcount,
|
||||||
flags, buffer_list);
|
type, buffer_list);
|
||||||
if (error)
|
if (error)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
@ -1292,7 +1288,7 @@ xfs_qm_quotacheck(
|
|||||||
* We don't log our changes till later.
|
* We don't log our changes till later.
|
||||||
*/
|
*/
|
||||||
if (uip) {
|
if (uip) {
|
||||||
error = xfs_qm_reset_dqcounts_buf(mp, uip, XFS_QMOPT_UQUOTA,
|
error = xfs_qm_reset_dqcounts_buf(mp, uip, XFS_DQ_USER,
|
||||||
&buffer_list);
|
&buffer_list);
|
||||||
if (error)
|
if (error)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
@ -1300,7 +1296,7 @@ xfs_qm_quotacheck(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (gip) {
|
if (gip) {
|
||||||
error = xfs_qm_reset_dqcounts_buf(mp, gip, XFS_QMOPT_GQUOTA,
|
error = xfs_qm_reset_dqcounts_buf(mp, gip, XFS_DQ_GROUP,
|
||||||
&buffer_list);
|
&buffer_list);
|
||||||
if (error)
|
if (error)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
@ -1308,7 +1304,7 @@ xfs_qm_quotacheck(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pip) {
|
if (pip) {
|
||||||
error = xfs_qm_reset_dqcounts_buf(mp, pip, XFS_QMOPT_PQUOTA,
|
error = xfs_qm_reset_dqcounts_buf(mp, pip, XFS_DQ_PROJ,
|
||||||
&buffer_list);
|
&buffer_list);
|
||||||
if (error)
|
if (error)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
|
Loading…
Reference in New Issue
Block a user