Skip to content

Commit a5b9155

Browse files
author
Darrick J. Wong
committed
xfs: repair quotas
Fix anything that causes the quota verifiers to fail. Signed-off-by: Darrick J. Wong <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]>
1 parent 21d7500 commit a5b9155

File tree

10 files changed

+628
-8
lines changed

10 files changed

+628
-8
lines changed

fs/xfs/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,5 +199,9 @@ xfs-y += $(addprefix scrub/, \
199199
xfs-$(CONFIG_XFS_RT) += $(addprefix scrub/, \
200200
rtbitmap_repair.o \
201201
)
202+
203+
xfs-$(CONFIG_XFS_QUOTA) += $(addprefix scrub/, \
204+
quota_repair.o \
205+
)
202206
endif
203207
endif

fs/xfs/scrub/quota.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "scrub/quota.h"
2222

2323
/* Convert a scrub type code to a DQ flag, or return 0 if error. */
24-
static inline xfs_dqtype_t
24+
xfs_dqtype_t
2525
xchk_quota_to_dqtype(
2626
struct xfs_scrub *sc)
2727
{
@@ -328,7 +328,6 @@ xchk_quota(
328328
if (error)
329329
break;
330330
}
331-
xchk_ilock(sc, XFS_ILOCK_EXCL);
332331
if (error == -ECANCELED)
333332
error = 0;
334333
if (!xchk_fblock_process_error(sc, XFS_DATA_FORK,

fs/xfs/scrub/quota.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#ifndef __XFS_SCRUB_QUOTA_H__
77
#define __XFS_SCRUB_QUOTA_H__
88

9+
xfs_dqtype_t xchk_quota_to_dqtype(struct xfs_scrub *sc);
10+
911
/* dquot iteration code */
1012

1113
struct xchk_dqiter {

0 commit comments

Comments
 (0)