xfs: create an ioctl to scrub AG metadata (36fd6e86) · Commits · 戴 / test

fs/xfs/Kconfig

+17 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,23 @@ config XFS_RT

		If unsure, say N.

		config XFS_ONLINE_SCRUB
		bool "XFS online metadata check support"
		default n
		depends on XFS_FS
		help
		If you say Y here you will be able to check metadata on a
		mounted XFS filesystem. This feature is intended to reduce
		filesystem downtime by supplementing xfs_repair. The key
		advantage here is to look for problems proactively so that
		they can be dealt with in a controlled manner.

		This feature is considered EXPERIMENTAL. Use with caution!

		See the xfs_scrub man page in section 8 for additional information.

		If unsure, say N.

		config XFS_WARN
		bool "XFS Verbose Warnings"
		depends on XFS_FS && !XFS_DEBUG

fs/xfs/Makefile

+11 −0

Original line number	Diff line number	Diff line
		@@ -135,3 +135,14 @@ xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
		xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o
		xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o
		xfs-$(CONFIG_EXPORTFS_BLOCK_OPS) += xfs_pnfs.o

		# online scrub/repair
		ifeq ($(CONFIG_XFS_ONLINE_SCRUB),y)

		# Tracepoints like to blow up, so build that before everything else

		xfs-y += $(addprefix scrub/, \
		trace.o \
		scrub.o \
		)
		endif

fs/xfs/libxfs/xfs_fs.h

+53 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,58 @@ typedef struct xfs_swapext
		#define XFS_FSOP_GOING_FLAGS_LOGFLUSH 0x1 /* flush log but not data */
		#define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH 0x2 /* don't flush log nor data */

		/* metadata scrubbing */
		struct xfs_scrub_metadata {
		__u32 sm_type; /* What to check? */
		__u32 sm_flags; /* flags; see below. */
		__u64 sm_ino; /* inode number. */
		__u32 sm_gen; /* inode generation. */
		__u32 sm_agno; /* ag number. */
		__u64 sm_reserved[5]; /* pad to 64 bytes */
		};

		/*
		* Metadata types and flags for scrub operation.
		*/

		/* Scrub subcommands. */

		/* Number of scrub subcommands. */
		#define XFS_SCRUB_TYPE_NR 0

		/* i: Repair this metadata. */
		#define XFS_SCRUB_IFLAG_REPAIR (1 << 0)

		/* o: Metadata object needs repair. */
		#define XFS_SCRUB_OFLAG_CORRUPT (1 << 1)

		/*
		* o: Metadata object could be optimized. It's not corrupt, but
		* we could improve on it somehow.
		*/
		#define XFS_SCRUB_OFLAG_PREEN (1 << 2)

		/* o: Cross-referencing failed. */
		#define XFS_SCRUB_OFLAG_XFAIL (1 << 3)

		/* o: Metadata object disagrees with cross-referenced metadata. */
		#define XFS_SCRUB_OFLAG_XCORRUPT (1 << 4)

		/* o: Scan was not complete. */
		#define XFS_SCRUB_OFLAG_INCOMPLETE (1 << 5)

		/* o: Metadata object looked funny but isn't corrupt. */
		#define XFS_SCRUB_OFLAG_WARNING (1 << 6)

		#define XFS_SCRUB_FLAGS_IN (XFS_SCRUB_IFLAG_REPAIR)
		#define XFS_SCRUB_FLAGS_OUT (XFS_SCRUB_OFLAG_CORRUPT \| \
		XFS_SCRUB_OFLAG_PREEN \| \
		XFS_SCRUB_OFLAG_XFAIL \| \
		XFS_SCRUB_OFLAG_XCORRUPT \| \
		XFS_SCRUB_OFLAG_INCOMPLETE \| \
		XFS_SCRUB_OFLAG_WARNING)
		#define XFS_SCRUB_FLAGS_ALL (XFS_SCRUB_FLAGS_IN \| XFS_SCRUB_FLAGS_OUT)

		/*
		* ioctl limits
		*/
		@@ -511,6 +563,7 @@ typedef struct xfs_swapext
		#define XFS_IOC_ZERO_RANGE _IOW ('X', 57, struct xfs_flock64)
		#define XFS_IOC_FREE_EOFBLOCKS _IOR ('X', 58, struct xfs_fs_eofblocks)
		/* XFS_IOC_GETFSMAP ------ hoisted 59 */
		#define XFS_IOC_SCRUB_METADATA _IOWR('X', 60, struct xfs_scrub_metadata)

		/*
		* ioctl commands that replace IRIX syssgi()'s

fs/xfs/scrub/scrub.c

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 Oracle. All Rights Reserved.
		*
		* Author: Darrick J. Wong <darrick.wong@oracle.com>
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		*
		* This program is distributed in the hope that it would be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write the Free Software Foundation,
		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
		*/
		#include "xfs.h"
		#include "xfs_fs.h"
		#include "xfs_shared.h"
		#include "xfs_format.h"
		#include "xfs_trans_resv.h"
		#include "xfs_mount.h"
		#include "xfs_defer.h"
		#include "xfs_btree.h"
		#include "xfs_bit.h"
		#include "xfs_log_format.h"
		#include "xfs_trans.h"
		#include "xfs_sb.h"
		#include "xfs_inode.h"
		#include "xfs_alloc.h"
		#include "xfs_alloc_btree.h"
		#include "xfs_bmap.h"
		#include "xfs_bmap_btree.h"
		#include "xfs_ialloc.h"
		#include "xfs_ialloc_btree.h"
		#include "xfs_refcount.h"
		#include "xfs_refcount_btree.h"
		#include "xfs_rmap.h"
		#include "xfs_rmap_btree.h"
		#include "scrub/xfs_scrub.h"
		#include "scrub/scrub.h"
		#include "scrub/trace.h"

		/* Dispatch metadata scrubbing. */
		int
		xfs_scrub_metadata(
		struct xfs_inode *ip,
		struct xfs_scrub_metadata *sm)
		{
		return -EOPNOTSUPP;
		}

fs/xfs/scrub/scrub.h

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 Oracle. All Rights Reserved.
		*
		* Author: Darrick J. Wong <darrick.wong@oracle.com>
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		*
		* This program is distributed in the hope that it would be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write the Free Software Foundation,
		* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
		*/
		#ifndef __XFS_SCRUB_SCRUB_H__
		#define __XFS_SCRUB_SCRUB_H__

		/* Metadata scrubbers */

		#endif /* __XFS_SCRUB_SCRUB_H__ */

Admin message