Merge branch 'xfs-4.10-misc-fixes-4' into for-next (9807b773) · Commits · 戴 / test

Documentation/filesystems/xfs.txt

+4 −8

Original line number	Diff line number	Diff line
		@@ -51,13 +51,6 @@ default behaviour.
		CRC enabled filesystems always use the attr2 format, and so
		will reject the noattr2 mount option if it is set.

		barrier (*)
		nobarrier
		Enables/disables the use of block layer write barriers for
		writes into the journal and for data integrity operations.
		This allows for drive level write caching to be enabled, for
		devices that support write barriers.

		discard
		nodiscard (*)
		Enable/disable the issuing of commands to let the block
		@@ -228,7 +221,10 @@ default behaviour.
		Deprecated Mount Options
		========================

		None at present.
		Name Removal Schedule
		---- ----------------
		barrier no earlier than v4.15
		nobarrier no earlier than v4.15


		Removed Mount Options

+1 −1

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ xfs_allocbt_init_cursor(

		ASSERT(btnum == XFS_BTNUM_BNO \|\| btnum == XFS_BTNUM_CNT);

		cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_SLEEP);
		cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

		cur->bc_tp = tp;
		cur->bc_mp = mp;

+7 −1

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ xfs_attr3_leaf_verify(
		{
		struct xfs_mount *mp = bp->b_target->bt_mount;
		struct xfs_attr_leafblock *leaf = bp->b_addr;
		struct xfs_perag *pag = bp->b_pag;
		struct xfs_attr3_icleaf_hdr ichdr;

		xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf);
		@@ -273,7 +274,12 @@ xfs_attr3_leaf_verify(
		if (ichdr.magic != XFS_ATTR_LEAF_MAGIC)
		return false;
		}
		if (ichdr.count == 0)
		/*
		* In recovery there is a transient state where count == 0 is valid
		* because we may have transitioned an empty shortform attr to a leaf
		* if the attr didn't fit in shortform.
		*/
		if (pag && pag->pagf_init && ichdr.count == 0)
		return false;

		/* XXX: need to range check rest of attr header values */

+1 −1

Original line number	Diff line number	Diff line
		@@ -796,7 +796,7 @@ xfs_bmbt_init_cursor(
		struct xfs_btree_cur *cur;
		ASSERT(whichfork != XFS_COW_FORK);

		cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_SLEEP);
		cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

		cur->bc_tp = tp;
		cur->bc_mp = mp;

+1 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ xfs_inobt_init_cursor(
		struct xfs_agi *agi = XFS_BUF_TO_AGI(agbp);
		struct xfs_btree_cur *cur;

		cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_SLEEP);
		cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);

		cur->bc_tp = tp;
		cur->bc_mp = mp;