Commit 80e4e126 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: scrub inodes

Scrub the fields within an inode.
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent edc09b52
...@@ -148,6 +148,7 @@ xfs-y += $(addprefix scrub/, \ ...@@ -148,6 +148,7 @@ xfs-y += $(addprefix scrub/, \
btree.o \ btree.o \
common.o \ common.o \
ialloc.o \ ialloc.o \
inode.o \
refcount.o \ refcount.o \
rmap.o \ rmap.o \
scrub.o \ scrub.o \
......
...@@ -494,9 +494,10 @@ struct xfs_scrub_metadata { ...@@ -494,9 +494,10 @@ struct xfs_scrub_metadata {
#define XFS_SCRUB_TYPE_FINOBT 8 /* free inode btree */ #define XFS_SCRUB_TYPE_FINOBT 8 /* free inode btree */
#define XFS_SCRUB_TYPE_RMAPBT 9 /* reverse mapping btree */ #define XFS_SCRUB_TYPE_RMAPBT 9 /* reverse mapping btree */
#define XFS_SCRUB_TYPE_REFCNTBT 10 /* reference count btree */ #define XFS_SCRUB_TYPE_REFCNTBT 10 /* reference count btree */
#define XFS_SCRUB_TYPE_INODE 11 /* inode record */
/* Number of scrub subcommands. */ /* Number of scrub subcommands. */
#define XFS_SCRUB_TYPE_NR 11 #define XFS_SCRUB_TYPE_NR 12
/* i: Repair this metadata. */ /* i: Repair this metadata. */
#define XFS_SCRUB_IFLAG_REPAIR (1 << 0) #define XFS_SCRUB_IFLAG_REPAIR (1 << 0)
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "xfs_trans.h" #include "xfs_trans.h"
#include "xfs_sb.h" #include "xfs_sb.h"
#include "xfs_inode.h" #include "xfs_inode.h"
#include "xfs_icache.h"
#include "xfs_itable.h"
#include "xfs_alloc.h" #include "xfs_alloc.h"
#include "xfs_alloc_btree.h" #include "xfs_alloc_btree.h"
#include "xfs_bmap.h" #include "xfs_bmap.h"
...@@ -488,3 +490,55 @@ xfs_scrub_checkpoint_log( ...@@ -488,3 +490,55 @@ xfs_scrub_checkpoint_log(
xfs_ail_push_all_sync(mp->m_ail); xfs_ail_push_all_sync(mp->m_ail);
return 0; return 0;
} }
/*
* Given an inode and the scrub control structure, grab either the
* inode referenced in the control structure or the inode passed in.
* The inode is not locked.
*/
int
xfs_scrub_get_inode(
struct xfs_scrub_context *sc,
struct xfs_inode *ip_in)
{
struct xfs_mount *mp = sc->mp;
struct xfs_inode *ip = NULL;
int error;
/*
* If userspace passed us an AG number or a generation number
* without an inode number, they haven't got a clue so bail out
* immediately.
*/
if (sc->sm->sm_agno || (sc->sm->sm_gen && !sc->sm->sm_ino))
return -EINVAL;
/* We want to scan the inode we already had opened. */
if (sc->sm->sm_ino == 0 || sc->sm->sm_ino == ip_in->i_ino) {
sc->ip = ip_in;
return 0;
}
/* Look up the inode, see if the generation number matches. */
if (xfs_internal_inum(mp, sc->sm->sm_ino))
return -ENOENT;
error = xfs_iget(mp, NULL, sc->sm->sm_ino,
XFS_IGET_UNTRUSTED | XFS_IGET_DONTCACHE, 0, &ip);
if (error == -ENOENT || error == -EINVAL) {
/* inode doesn't exist... */
return -ENOENT;
} else if (error) {
trace_xfs_scrub_op_error(sc,
XFS_INO_TO_AGNO(mp, sc->sm->sm_ino),
XFS_INO_TO_AGBNO(mp, sc->sm->sm_ino),
error, __return_address);
return error;
}
if (VFS_I(ip)->i_generation != sc->sm->sm_gen) {
iput(VFS_I(ip));
return -ENOENT;
}
sc->ip = ip;
return 0;
}
...@@ -87,6 +87,8 @@ int xfs_scrub_setup_ag_rmapbt(struct xfs_scrub_context *sc, ...@@ -87,6 +87,8 @@ int xfs_scrub_setup_ag_rmapbt(struct xfs_scrub_context *sc,
struct xfs_inode *ip); struct xfs_inode *ip);
int xfs_scrub_setup_ag_refcountbt(struct xfs_scrub_context *sc, int xfs_scrub_setup_ag_refcountbt(struct xfs_scrub_context *sc,
struct xfs_inode *ip); struct xfs_inode *ip);
int xfs_scrub_setup_inode(struct xfs_scrub_context *sc,
struct xfs_inode *ip);
void xfs_scrub_ag_free(struct xfs_scrub_context *sc, struct xfs_scrub_ag *sa); void xfs_scrub_ag_free(struct xfs_scrub_context *sc, struct xfs_scrub_ag *sa);
...@@ -105,5 +107,6 @@ int xfs_scrub_walk_agfl(struct xfs_scrub_context *sc, ...@@ -105,5 +107,6 @@ int xfs_scrub_walk_agfl(struct xfs_scrub_context *sc,
int xfs_scrub_setup_ag_btree(struct xfs_scrub_context *sc, int xfs_scrub_setup_ag_btree(struct xfs_scrub_context *sc,
struct xfs_inode *ip, bool force_log); struct xfs_inode *ip, bool force_log);
int xfs_scrub_get_inode(struct xfs_scrub_context *sc, struct xfs_inode *ip_in);
#endif /* __XFS_SCRUB_COMMON_H__ */ #endif /* __XFS_SCRUB_COMMON_H__ */
This diff is collapsed.
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "xfs_trans.h" #include "xfs_trans.h"
#include "xfs_sb.h" #include "xfs_sb.h"
#include "xfs_inode.h" #include "xfs_inode.h"
#include "xfs_icache.h"
#include "xfs_itable.h"
#include "xfs_alloc.h" #include "xfs_alloc.h"
#include "xfs_alloc_btree.h" #include "xfs_alloc_btree.h"
#include "xfs_bmap.h" #include "xfs_bmap.h"
...@@ -141,6 +143,7 @@ xfs_scrub_probe( ...@@ -141,6 +143,7 @@ xfs_scrub_probe(
STATIC int STATIC int
xfs_scrub_teardown( xfs_scrub_teardown(
struct xfs_scrub_context *sc, struct xfs_scrub_context *sc,
struct xfs_inode *ip_in,
int error) int error)
{ {
xfs_scrub_ag_free(sc, &sc->sa); xfs_scrub_ag_free(sc, &sc->sa);
...@@ -148,6 +151,13 @@ xfs_scrub_teardown( ...@@ -148,6 +151,13 @@ xfs_scrub_teardown(
xfs_trans_cancel(sc->tp); xfs_trans_cancel(sc->tp);
sc->tp = NULL; sc->tp = NULL;
} }
if (sc->ip) {
xfs_iunlock(sc->ip, sc->ilock_flags);
if (sc->ip != ip_in &&
!xfs_internal_inum(sc->mp, sc->ip->i_ino))
iput(VFS_I(sc->ip));
sc->ip = NULL;
}
return error; return error;
} }
...@@ -201,6 +211,10 @@ static const struct xfs_scrub_meta_ops meta_scrub_ops[] = { ...@@ -201,6 +211,10 @@ static const struct xfs_scrub_meta_ops meta_scrub_ops[] = {
.scrub = xfs_scrub_refcountbt, .scrub = xfs_scrub_refcountbt,
.has = xfs_sb_version_hasreflink, .has = xfs_sb_version_hasreflink,
}, },
{ /* inode record */
.setup = xfs_scrub_setup_inode,
.scrub = xfs_scrub_inode,
},
}; };
/* This isn't a stable feature, warn once per day. */ /* This isn't a stable feature, warn once per day. */
...@@ -300,7 +314,7 @@ xfs_scrub_metadata( ...@@ -300,7 +314,7 @@ xfs_scrub_metadata(
* Tear down everything we hold, then set up again with * Tear down everything we hold, then set up again with
* preparation for worst-case scenarios. * preparation for worst-case scenarios.
*/ */
error = xfs_scrub_teardown(&sc, 0); error = xfs_scrub_teardown(&sc, ip, 0);
if (error) if (error)
goto out; goto out;
try_harder = true; try_harder = true;
...@@ -313,7 +327,7 @@ xfs_scrub_metadata( ...@@ -313,7 +327,7 @@ xfs_scrub_metadata(
xfs_alert_ratelimited(mp, "Corruption detected during scrub."); xfs_alert_ratelimited(mp, "Corruption detected during scrub.");
out_teardown: out_teardown:
error = xfs_scrub_teardown(&sc, error); error = xfs_scrub_teardown(&sc, ip, error);
out: out:
trace_xfs_scrub_done(ip, sm, error); trace_xfs_scrub_done(ip, sm, error);
if (error == -EFSCORRUPTED || error == -EFSBADCRC) { if (error == -EFSCORRUPTED || error == -EFSBADCRC) {
......
...@@ -59,6 +59,7 @@ struct xfs_scrub_context { ...@@ -59,6 +59,7 @@ struct xfs_scrub_context {
const struct xfs_scrub_meta_ops *ops; const struct xfs_scrub_meta_ops *ops;
struct xfs_trans *tp; struct xfs_trans *tp;
struct xfs_inode *ip; struct xfs_inode *ip;
uint ilock_flags;
bool try_harder; bool try_harder;
/* State tracking for single-AG operations. */ /* State tracking for single-AG operations. */
...@@ -77,5 +78,6 @@ int xfs_scrub_inobt(struct xfs_scrub_context *sc); ...@@ -77,5 +78,6 @@ int xfs_scrub_inobt(struct xfs_scrub_context *sc);
int xfs_scrub_finobt(struct xfs_scrub_context *sc); int xfs_scrub_finobt(struct xfs_scrub_context *sc);
int xfs_scrub_rmapbt(struct xfs_scrub_context *sc); int xfs_scrub_rmapbt(struct xfs_scrub_context *sc);
int xfs_scrub_refcountbt(struct xfs_scrub_context *sc); int xfs_scrub_refcountbt(struct xfs_scrub_context *sc);
int xfs_scrub_inode(struct xfs_scrub_context *sc);
#endif /* __XFS_SCRUB_SCRUB_H__ */ #endif /* __XFS_SCRUB_SCRUB_H__ */
...@@ -1202,6 +1202,8 @@ xfs_ioctl_setattr_get_trans( ...@@ -1202,6 +1202,8 @@ xfs_ioctl_setattr_get_trans(
* 8. for non-realtime files, the extent size hint must be limited * 8. for non-realtime files, the extent size hint must be limited
* to half the AG size to avoid alignment extending the extent beyond the * to half the AG size to avoid alignment extending the extent beyond the
* limits of the AG. * limits of the AG.
*
* Please keep this function in sync with xfs_scrub_inode_extsize.
*/ */
static int static int
xfs_ioctl_setattr_check_extsize( xfs_ioctl_setattr_check_extsize(
...@@ -1258,6 +1260,8 @@ xfs_ioctl_setattr_check_extsize( ...@@ -1258,6 +1260,8 @@ xfs_ioctl_setattr_check_extsize(
* 5. Extent size must be a multiple of the appropriate block size. * 5. Extent size must be a multiple of the appropriate block size.
* 6. The extent size hint must be limited to half the AG size to avoid * 6. The extent size hint must be limited to half the AG size to avoid
* alignment extending the extent beyond the limits of the AG. * alignment extending the extent beyond the limits of the AG.
*
* Please keep this function in sync with xfs_scrub_inode_cowextsize.
*/ */
static int static int
xfs_ioctl_setattr_check_cowextsize( xfs_ioctl_setattr_check_cowextsize(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment