public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-04-13 09:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: record health problems with the metadata directory

Browse source 
Make a report to the health monitoring subsystem any time we encounter
something in the metadata directory tree that looks like corruption.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2024-11-03 20:18:57 -08:00
parent 61b6bdb30a
commit be42fc1393
6 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/xfs/libxfs/xfs_fs.h
View file

@ -198,6 +198,7 @@ struct xfs_fsop_geom {
#define XFS_FSOP_GEOM_SICK_RT_SUMMARY (1 << 5) /* realtime summary */ #define XFS_FSOP_GEOM_SICK_RT_SUMMARY (1 << 5) /* realtime summary */
#define XFS_FSOP_GEOM_SICK_QUOTACHECK (1 << 6) /* quota counts */ #define XFS_FSOP_GEOM_SICK_QUOTACHECK (1 << 6) /* quota counts */
#define XFS_FSOP_GEOM_SICK_NLINKS (1 << 7) /* inode link counts */ #define XFS_FSOP_GEOM_SICK_NLINKS (1 << 7) /* inode link counts */
#define XFS_FSOP_GEOM_SICK_METADIR (1 << 8) /* metadata directory */
/* Output for XFS_FS_COUNTS */ /* Output for XFS_FS_COUNTS */
typedef struct xfs_fsop_counts { typedef struct xfs_fsop_counts {

4
fs/xfs/libxfs/xfs_health.h
View file

@ -62,6 +62,7 @@ struct xfs_da_args;
#define XFS_SICK_FS_PQUOTA (1 << 3) /* project quota */ #define XFS_SICK_FS_PQUOTA (1 << 3) /* project quota */
#define XFS_SICK_FS_QUOTACHECK (1 << 4) /* quota counts */ #define XFS_SICK_FS_QUOTACHECK (1 << 4) /* quota counts */
#define XFS_SICK_FS_NLINKS (1 << 5) /* inode link counts */ #define XFS_SICK_FS_NLINKS (1 << 5) /* inode link counts */
#define XFS_SICK_FS_METADIR (1 << 6) /* metadata directory tree */
/* Observable health issues for realtime volume metadata. */ /* Observable health issues for realtime volume metadata. */
#define XFS_SICK_RT_BITMAP (1 << 0) /* realtime bitmap */ #define XFS_SICK_RT_BITMAP (1 << 0) /* realtime bitmap */
@ -105,7 +106,8 @@ struct xfs_da_args;
XFS_SICK_FS_GQUOTA | \ XFS_SICK_FS_GQUOTA | \
XFS_SICK_FS_PQUOTA | \ XFS_SICK_FS_PQUOTA | \
XFS_SICK_FS_QUOTACHECK | \ XFS_SICK_FS_QUOTACHECK | \
XFS_SICK_FS_NLINKS) XFS_SICK_FS_NLINKS | \
XFS_SICK_FS_METADIR)
#define XFS_SICK_RT_PRIMARY (XFS_SICK_RT_BITMAP | \ #define XFS_SICK_RT_PRIMARY (XFS_SICK_RT_BITMAP | \
XFS_SICK_RT_SUMMARY) XFS_SICK_RT_SUMMARY)

13
fs/xfs/libxfs/xfs_metadir.c
View file

@ -28,6 +28,7 @@
#include "xfs_dir2.h" #include "xfs_dir2.h"
#include "xfs_dir2_priv.h" #include "xfs_dir2_priv.h"
#include "xfs_parent.h" #include "xfs_parent.h"
#include "xfs_health.h"
/* /*
* Metadata Directory Tree * Metadata Directory Tree
@ -94,8 +95,10 @@ xfs_metadir_lookup(
}; };
int error; int error;
if (!S_ISDIR(VFS_I(dp)->i_mode)) if (!S_ISDIR(VFS_I(dp)->i_mode)) {
xfs_fs_mark_sick(mp, XFS_SICK_FS_METADIR);
return -EFSCORRUPTED; return -EFSCORRUPTED;
}
if (xfs_is_shutdown(mp)) if (xfs_is_shutdown(mp))
return -EIO; return -EIO;
@ -103,10 +106,14 @@ xfs_metadir_lookup(
if (error) if (error)
return error; return error;
if (!xfs_verify_ino(mp, args.inumber)) if (!xfs_verify_ino(mp, args.inumber)) {
xfs_fs_mark_sick(mp, XFS_SICK_FS_METADIR);
return -EFSCORRUPTED; return -EFSCORRUPTED;
if (xname->type != XFS_DIR3_FT_UNKNOWN && xname->type != args.filetype) }
if (xname->type != XFS_DIR3_FT_UNKNOWN && xname->type != args.filetype) {
xfs_fs_mark_sick(mp, XFS_SICK_FS_METADIR);
return -EFSCORRUPTED; return -EFSCORRUPTED;
}
trace_xfs_metadir_lookup(dp, xname, args.inumber); trace_xfs_metadir_lookup(dp, xname, args.inumber);
*ino = args.inumber; *ino = args.inumber;

1
fs/xfs/xfs_health.c
View file

@ -380,6 +380,7 @@ static const struct ioctl_sick_map fs_map[] = {
{ XFS_SICK_FS_PQUOTA, XFS_FSOP_GEOM_SICK_PQUOTA }, { XFS_SICK_FS_PQUOTA, XFS_FSOP_GEOM_SICK_PQUOTA },
{ XFS_SICK_FS_QUOTACHECK, XFS_FSOP_GEOM_SICK_QUOTACHECK }, { XFS_SICK_FS_QUOTACHECK, XFS_FSOP_GEOM_SICK_QUOTACHECK },
{ XFS_SICK_FS_NLINKS, XFS_FSOP_GEOM_SICK_NLINKS }, { XFS_SICK_FS_NLINKS, XFS_FSOP_GEOM_SICK_NLINKS },
{ XFS_SICK_FS_METADIR, XFS_FSOP_GEOM_SICK_METADIR },
{ 0, 0 }, { 0, 0 },
}; };

1
fs/xfs/xfs_icache.c
View file

@ -878,6 +878,7 @@ bad_rele:
whine: whine:
xfs_err(mp, "metadata inode 0x%llx type %u is corrupt", ino, xfs_err(mp, "metadata inode 0x%llx type %u is corrupt", ino,
metafile_type); metafile_type);
xfs_fs_mark_sick(mp, XFS_SICK_FS_METADIR);
return -EFSCORRUPTED; return -EFSCORRUPTED;
} }

1
fs/xfs/xfs_inode.c
View file

@ -560,6 +560,7 @@ xfs_lookup(
* a metadata file. * a metadata file.
*/ */
if (XFS_IS_CORRUPT(dp->i_mount, xfs_is_metadir_inode(*ipp))) { if (XFS_IS_CORRUPT(dp->i_mount, xfs_is_metadir_inode(*ipp))) {
xfs_fs_mark_sick(dp->i_mount, XFS_SICK_FS_METADIR);
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto out_irele; goto out_irele;
} }