mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
xfs: repair link count of nondirectories after rebuilding parent pointers
Since the parent pointer scrubber does not exhaustively search the filesystem for missing parent pointers, it doesn't have a good way to determine that there are pointers missing from an otherwise uncorrupt xattr structure. Instead, for nondirectories it employs a heuristic of comparing the file link count to the number of parent pointers found. However, we don't want this heuristic flagging a false corruption after a repair has actually scanned the entire filesystem to rebuild the parent pointers. Therefore, reset the file link count in this one case because we actually know the correct link count. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
7be3d20bbe
commit
3f50ddbf4b
@ -27,6 +27,7 @@
|
||||
#include "xfs_parent.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_bmap.h"
|
||||
#include "xfs_ag.h"
|
||||
#include "scrub/xfs_scrub.h"
|
||||
#include "scrub/scrub.h"
|
||||
#include "scrub/common.h"
|
||||
@ -156,6 +157,9 @@ struct xrep_parent {
|
||||
|
||||
/* Have we seen any live updates of parent pointers recently? */
|
||||
bool saw_pptr_updates;
|
||||
|
||||
/* Number of parents we found after all other repairs */
|
||||
unsigned long long parents;
|
||||
};
|
||||
|
||||
struct xrep_parent_xattr {
|
||||
@ -1370,6 +1374,102 @@ xrep_parent_rebuild_tree(
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Count the number of parent pointers. */
|
||||
STATIC int
|
||||
xrep_parent_count_pptr(
|
||||
struct xfs_scrub *sc,
|
||||
struct xfs_inode *ip,
|
||||
unsigned int attr_flags,
|
||||
const unsigned char *name,
|
||||
unsigned int namelen,
|
||||
const void *value,
|
||||
unsigned int valuelen,
|
||||
void *priv)
|
||||
{
|
||||
struct xrep_parent *rp = priv;
|
||||
int error;
|
||||
|
||||
if (!(attr_flags & XFS_ATTR_PARENT))
|
||||
return 0;
|
||||
|
||||
error = xfs_parent_from_attr(sc->mp, attr_flags, name, namelen, value,
|
||||
valuelen, NULL, NULL);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
rp->parents++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* After all parent pointer rebuilding and adoption activity completes, reset
|
||||
* the link count of this nondirectory, having scanned the fs to rebuild all
|
||||
* parent pointers.
|
||||
*/
|
||||
STATIC int
|
||||
xrep_parent_set_nondir_nlink(
|
||||
struct xrep_parent *rp)
|
||||
{
|
||||
struct xfs_scrub *sc = rp->sc;
|
||||
struct xfs_inode *ip = sc->ip;
|
||||
struct xfs_perag *pag;
|
||||
bool joined = false;
|
||||
int error;
|
||||
|
||||
/* Count parent pointers so we can reset the file link count. */
|
||||
rp->parents = 0;
|
||||
error = xchk_xattr_walk(sc, ip, xrep_parent_count_pptr, NULL, rp);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
if (rp->parents > 0 && xfs_inode_on_unlinked_list(ip)) {
|
||||
xfs_trans_ijoin(sc->tp, sc->ip, 0);
|
||||
joined = true;
|
||||
|
||||
/*
|
||||
* The file is on the unlinked list but we found parents.
|
||||
* Remove the file from the unlinked list.
|
||||
*/
|
||||
pag = xfs_perag_get(sc->mp, XFS_INO_TO_AGNO(sc->mp, ip->i_ino));
|
||||
if (!pag) {
|
||||
ASSERT(0);
|
||||
return -EFSCORRUPTED;
|
||||
}
|
||||
|
||||
error = xfs_iunlink_remove(sc->tp, pag, ip);
|
||||
xfs_perag_put(pag);
|
||||
if (error)
|
||||
return error;
|
||||
} else if (rp->parents == 0 && !xfs_inode_on_unlinked_list(ip)) {
|
||||
xfs_trans_ijoin(sc->tp, sc->ip, 0);
|
||||
joined = true;
|
||||
|
||||
/*
|
||||
* The file is not on the unlinked list but we found no
|
||||
* parents. Add the file to the unlinked list.
|
||||
*/
|
||||
error = xfs_iunlink(sc->tp, ip);
|
||||
if (error)
|
||||
return error;
|
||||
}
|
||||
|
||||
/* Set the correct link count. */
|
||||
if (VFS_I(ip)->i_nlink != rp->parents) {
|
||||
if (!joined) {
|
||||
xfs_trans_ijoin(sc->tp, sc->ip, 0);
|
||||
joined = true;
|
||||
}
|
||||
|
||||
set_nlink(VFS_I(ip), min_t(unsigned long long, rp->parents,
|
||||
XFS_NLINK_PINNED));
|
||||
}
|
||||
|
||||
/* Log the inode to keep it moving forward if we dirtied anything. */
|
||||
if (joined)
|
||||
xfs_trans_log_inode(sc->tp, ip, XFS_ILOG_CORE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Set up the filesystem scan so we can look for parents. */
|
||||
STATIC int
|
||||
xrep_parent_setup_scan(
|
||||
@ -1494,6 +1594,13 @@ xrep_parent(
|
||||
error = xrep_parent_rebuild_tree(rp);
|
||||
if (error)
|
||||
goto out_teardown;
|
||||
if (xfs_has_parent(sc->mp) && !S_ISDIR(VFS_I(sc->ip)->i_mode)) {
|
||||
error = xrep_parent_set_nondir_nlink(rp);
|
||||
if (error)
|
||||
goto out_teardown;
|
||||
}
|
||||
|
||||
error = xrep_defer_finish(sc);
|
||||
|
||||
out_teardown:
|
||||
xrep_parent_teardown(rp);
|
||||
|
Loading…
Reference in New Issue
Block a user