Commit 77a78806 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs 

Pull xfs updates from Dave Chinner:
 "There isn't a whole lot to this update - it's mostly bug fixes and
  they are spread pretty much all over XFS.  There are some corruption
  fixes, some fixes for log recovery, some fixes that prevent unount
  from hanging, a lockdep annotation rework for inode locking to prevent
  false positives and the usual random bunch of cleanups and minor
  improvements.

  Deatils:

   - large rework of EFI/EFD lifecycle handling to fix log recovery
     corruption issues, crashes and unmount hangs

   - separate metadata UUID on disk to enable changing boot label UUID
     for v5 filesystems

   - fixes for gcc miscompilation on certain platforms and optimisation
     levels

   - remote attribute allocation and recovery corruption fixes

   - inode lockdep annotation rework to fix bugs with too many
     subclasses

   - directory inode locking changes to prevent lockdep false positives

   - a handful of minor corruption fixes

   - various other small cleanups and bug fixes"

* tag 'xfs-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (42 commits)
  xfs: fix error gotos in xfs_setattr_nonsize
  xfs: add mssing inode cache attempts counter increment
  xfs: return errors from partial I/O failures to files
  libxfs: bad magic number should set da block buffer error
  xfs: fix non-debug build warnings
  xfs: collapse allocsize and biosize mount option handling
  xfs: Fix file type directory corruption for btree directories
  xfs: lockdep annotations throw warnings on non-debug builds
  xfs: Fix uninitialized return value in xfs_alloc_fix_freelist()
  xfs: inode lockdep annotations broke non-lockdep build
  xfs: flush entire file on dio read/write to cached file
  xfs: Fix xfs_attr_leafblock definition
  libxfs: readahead of dir3 data blocks should use the read verifier
  xfs: stop holding ILOCK over filldir callbacks
  xfs: clean up inode lockdep annotations
  xfs: swap leaf buffer into path struct atomically during path shift
  xfs: relocate sparse inode mount warning
  xfs: dquots should be stamped with sb_meta_uuid
  xfs: log recovery needs to validate against sb_meta_uuid
  xfs: growfs not aware of sb_meta_uuid
  ...
parents 7d9071a0 5d54b8cd

fs/xfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ xfs-y += $(addprefix libxfs/, \ 
				   xfs_attr.o \

				   xfs_attr_leaf.o \

				   xfs_attr_remote.o \

				   xfs_bit.o \

				   xfs_bmap.o \

				   xfs_bmap_btree.o \

				   xfs_btree.o \
@@ -63,7 +64,6 @@ xfs-$(CONFIG_XFS_RT) += $(addprefix libxfs/, \ 
xfs-y				+= xfs_aops.o \

				   xfs_attr_inactive.o \

				   xfs_attr_list.o \

				   xfs_bit.o \

				   xfs_bmap_util.o \

				   xfs_buf.o \

				   xfs_dir2_readdir.o \

fs/xfs/libxfs/xfs_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ xfs_agfl_verify( 
	struct xfs_agfl	*agfl = XFS_BUF_TO_AGFL(bp);

	int		i;



	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_uuid))

	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))

		return false;

	if (be32_to_cpu(agfl->agfl_magicnum) != XFS_AGFL_MAGIC)

		return false;
@@ -1937,7 +1937,7 @@ xfs_alloc_fix_freelist( 
	struct xfs_alloc_arg	targs;	/* local allocation arguments */

	xfs_agblock_t		bno;	/* freelist block */

	xfs_extlen_t		need;	/* total blocks needed in freelist */

	int			error;

	int			error = 0;



	if (!pag->pagf_init) {

		error = xfs_alloc_read_agf(mp, tp, args->agno, flags, &agbp);
@@ -2260,7 +2260,7 @@ xfs_agf_verify( 
	struct xfs_agf	*agf = XFS_BUF_TO_AGF(bp);



	if (xfs_sb_version_hascrc(&mp->m_sb) &&

	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_uuid))

	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))

			return false;



	if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&

fs/xfs/libxfs/xfs_alloc_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ xfs_allocbt_verify( 
	case cpu_to_be32(XFS_ABTB_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

			return false;
@@ -313,7 +313,7 @@ xfs_allocbt_verify( 
	case cpu_to_be32(XFS_ABTC_CRC_MAGIC):

		if (!xfs_sb_version_hascrc(&mp->m_sb))

			return false;

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

			return false;

fs/xfs/libxfs/xfs_attr.c

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ xfs_attr_get( 


	args.value = value;

	args.valuelen = *valuelenp;

	/* Entirely possible to look up a name which doesn't exist */

	args.op_flags = XFS_DA_OP_OKNOENT;



	lock_mode = xfs_ilock_attr_map_shared(ip);

	if (!xfs_inode_hasattr(ip))

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ xfs_attr3_leaf_verify( 
		if (ichdr.magic != XFS_ATTR3_LEAF_MAGIC)

			return false;



		if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_uuid))

		if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))

			return false;

		if (be64_to_cpu(hdr3->info.blkno) != bp->b_bn)

			return false;
@@ -1056,7 +1056,7 @@ xfs_attr3_leaf_create( 


		hdr3->blkno = cpu_to_be64(bp->b_bn);

		hdr3->owner = cpu_to_be64(dp->i_ino);

		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_uuid);

		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_meta_uuid);



		ichdr.freemap[0].base = sizeof(struct xfs_attr3_leaf_hdr);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE