Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 808eb24e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-4.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs updates from Darrick Wong:
 "xfs: great scads of new stuff for 4.15.

  This merge cycle, we're making some substantive changes to XFS. The
  in-core extent mappings have been refactored to use proper iterators
  and a btree to handle heavily fragmented files without needing
  high-order memory allocations; some important log recovery bug fixes;
  and the first part of the online fsck functionality.

  (The online fsck feature is disabled by default and more pieces of it
  will be coming in future release cycles.)

  This giant pile of patches has been run through a full xfstests run
  over the weekend and through a quick xfstests run against this
  morning's master, with no major failures reported.

  New in this version:

   - Refactor the incore extent map manipulations to use a cursor
     instead of directly modifying extent data.

   - Refactor the incore extent map cursor to use an in-memory btree
     instead of a single high-order allocation. This eliminates a major
     source of complaints about insufficient memory when opening a
     heavily fragmented file into a system whose memory is also heavily
     fragmented.

   - Fix a longstanding bug where deleting a file with a complex
     extended attribute btree incorrectly handled memory pointers, which
     could lead to memory corruption.

   - Improve metadata validation to eliminate crashing problems found
     while fuzzing xfs.

   - Move the error injection tag definitions into libxfs to be shared
     with userspace components.

   - Fix some log recovery bugs where we'd underflow log block position
     vector and incorrectly fail log recovery.

   - Drain the buffer lru after log recovery to force recovered buffers
     back through the verifiers after mount. On a v4 filesystem the log
     never attaches verifiers during log replay (v5 does), so we could
     end up with buffers marked verified but without having ever been
     verified.

   - Fix various other bugs.

   - Introduce the first part of a new online fsck tool. The new fsck
     tool will be able to iterate every piece of metadata in the
     filesystem to look for obvious errors and corruptions. In the next
     release cycle the checking will be extended to cross-reference with
     the other fs metadata, so this feature should only be used by the
     developers in the mean time"

* tag 'xfs-4.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (131 commits)
  xfs: on failed mount, force-reclaim inodes after unmounting quota controls
  xfs: check the uniqueness of the AGFL entries
  xfs: remove u_int* type usage
  xfs: handle zero entries case in xfs_iext_rebalance_leaf
  xfs: add comments documenting the rebalance algorithm
  xfs: trivial indentation fixup for xfs_iext_remove_node
  xfs: remove a superflous assignment in xfs_iext_remove_node
  xfs: add some comments to xfs_iext_insert/xfs_iext_insert_node
  xfs: fix number of records handling in xfs_iext_split_leaf
  fs/xfs: Remove NULL check before kmem_cache_destroy
  xfs: only check da node header padding on v5 filesystems
  xfs: fix btree scrub deref check
  xfs: fix uninitialized return values in scrub code
  xfs: pass inode number to xfs_scrub_ino_set_{preen,warning}
  xfs: refactor the directory data block bestfree checks
  xfs: mark xlog_verify_dest_ptr STATIC
  xfs: mark xlog_recover_check_summary STATIC
  xfs: mark xfs_btree_check_lblock and xfs_btree_check_ptr static
  xfs: remove unreachable error injection code in xfs_qm_dqget
  xfs: remove unused debug counts for xfs_lock_inodes
  ...
parents ae9a8c4b 2d1d1da3

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

+29 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ xfs-y += $(addprefix libxfs/, \ 
				   xfs_dquot_buf.o \

				   xfs_ialloc.o \

				   xfs_ialloc_btree.o \

				   xfs_iext_tree.o \

				   xfs_inode_fork.o \

				   xfs_inode_buf.o \

				   xfs_log_rlimit.o \
@@ -135,3 +136,31 @@ 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 \

				   agheader.o \

				   alloc.o \

				   attr.o \

				   bmap.o \

				   btree.o \

				   common.o \

				   dabtree.o \

				   dir.o \

				   ialloc.o \

				   inode.o \

				   parent.o \

				   refcount.o \

				   rmap.o \

				   scrub.o \

				   symlink.o \

				   )



xfs-$(CONFIG_XFS_RT)		+= scrub/rtbitmap.o

xfs-$(CONFIG_XFS_QUOTA)		+= scrub/quota.o

endif

fs/xfs/kmem.h

+1 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ kmem_zone_free(kmem_zone_t *zone, void *ptr) 
static inline void

kmem_zone_destroy(kmem_zone_t *zone)

{

	if (zone)

	kmem_cache_destroy(zone);

}

fs/xfs/libxfs/xfs_ag_resv.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_alloc.h"

#include "xfs_errortag.h"

#include "xfs_error.h"

#include "xfs_trace.h"

#include "xfs_cksum.h"

fs/xfs/libxfs/xfs_alloc.c

+50 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "xfs_alloc_btree.h"

#include "xfs_alloc.h"

#include "xfs_extent_busy.h"

#include "xfs_errortag.h"

#include "xfs_error.h"

#include "xfs_cksum.h"

#include "xfs_trace.h"
@@ -2931,3 +2932,52 @@ xfs_alloc_query_all( 
	query.fn = fn;

	return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query);

}



/* Find the size of the AG, in blocks. */

xfs_agblock_t

xfs_ag_block_count(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno)

{

	ASSERT(agno < mp->m_sb.sb_agcount);



	if (agno < mp->m_sb.sb_agcount - 1)

		return mp->m_sb.sb_agblocks;

	return mp->m_sb.sb_dblocks - (agno * mp->m_sb.sb_agblocks);

}



/*

 * Verify that an AG block number pointer neither points outside the AG

 * nor points at static metadata.

 */

bool

xfs_verify_agbno(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agblock_t		agbno)

{

	xfs_agblock_t		eoag;



	eoag = xfs_ag_block_count(mp, agno);

	if (agbno >= eoag)

		return false;

	if (agbno <= XFS_AGFL_BLOCK(mp))

		return false;

	return true;

}



/*

 * Verify that an FS block number pointer neither points outside the

 * filesystem nor points at static AG metadata.

 */

bool

xfs_verify_fsbno(

	struct xfs_mount	*mp,

	xfs_fsblock_t		fsbno)

{

	xfs_agnumber_t		agno = XFS_FSB_TO_AGNO(mp, fsbno);



	if (agno >= mp->m_sb.sb_agcount)

		return false;

	return xfs_verify_agbno(mp, agno, XFS_FSB_TO_AGBNO(mp, fsbno));

}