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

Commit 7d1ce606 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-iomap-for-linus-4.8-rc5' of... 

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

Pull xfs and iomap fixes from Dave Chinner:
 "Most of these changes are small regression fixes that address problems
  introduced in the 4.8-rc1 window.  The two fixes that aren't (IO
  completion fix and superblock inprogress check) are fixes for problems
  introduced some time ago and need to be pushed back to stable kernels.

  Changes in this update:
   - iomap FIEMAP_EXTENT_MERGED usage fix
   - additional mount-time feature restrictions
   - rmap btree query fixes
   - freeze/unmount io completion workqueue fix
   - memory corruption fix for deferred operations handling"

* tag 'xfs-iomap-for-linus-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs:
  xfs: track log done items directly in the deferred pending work item
  iomap: don't set FIEMAP_EXTENT_MERGED for extent based filesystems
  xfs: prevent dropping ioend completions during buftarg wait
  xfs: fix superblock inprogress check
  xfs: simple btree query range should look right if LE lookup fails
  xfs: fix some key handling problems in _btree_simple_query_range
  xfs: don't log the entire end of the AGF
  xfs: disallow mounting of realtime + rmap filesystems
  xfs: don't perform lookups on zero-height btrees
parents 071e31e2 ea78d808

fs/iomap.c

+4 −1
Original line number Diff line number Diff line
@@ -428,9 +428,12 @@ static int iomap_to_fiemap(struct fiemap_extent_info *fi, 
		break;

	}



	if (iomap->flags & IOMAP_F_MERGED)

		flags |= FIEMAP_EXTENT_MERGED;



	return fiemap_fill_next_extent(fi, iomap->offset,

			iomap->blkno != IOMAP_NULL_BLOCK ? iomap->blkno << 9: 0,

			iomap->length, flags | FIEMAP_EXTENT_MERGED);

			iomap->length, flags);



}

fs/xfs/libxfs/xfs_alloc.c

+2 −0
Original line number Diff line number Diff line
@@ -2278,6 +2278,8 @@ xfs_alloc_log_agf( 
		offsetof(xfs_agf_t, agf_btreeblks),

		offsetof(xfs_agf_t, agf_uuid),

		offsetof(xfs_agf_t, agf_rmap_blocks),

		/* needed so that we don't log the whole rest of the structure: */

		offsetof(xfs_agf_t, agf_spare64),

		sizeof(xfs_agf_t)

	};

fs/xfs/libxfs/xfs_btree.c

+13 −1
Original line number Diff line number Diff line
@@ -1814,6 +1814,10 @@ xfs_btree_lookup( 


	XFS_BTREE_STATS_INC(cur, lookup);



	/* No such thing as a zero-level tree. */

	if (cur->bc_nlevels == 0)

		return -EFSCORRUPTED;



	block = NULL;

	keyno = 0;
@@ -4554,15 +4558,22 @@ xfs_btree_simple_query_range( 
	if (error)

		goto out;



	/* Nothing?  See if there's anything to the right. */

	if (!stat) {

		error = xfs_btree_increment(cur, 0, &stat);

		if (error)

			goto out;

	}



	while (stat) {

		/* Find the record. */

		error = xfs_btree_get_rec(cur, &recp, &stat);

		if (error || !stat)

			break;

		cur->bc_ops->init_high_key_from_rec(&rec_key, recp);



		/* Skip if high_key(rec) < low_key. */

		if (firstrec) {

			cur->bc_ops->init_high_key_from_rec(&rec_key, recp);

			firstrec = false;

			diff = cur->bc_ops->diff_two_keys(cur, low_key,

					&rec_key);
@@ -4571,6 +4582,7 @@ xfs_btree_simple_query_range( 
		}



		/* Stop if high_key < low_key(rec). */

		cur->bc_ops->init_key_from_rec(&rec_key, recp);

		diff = cur->bc_ops->diff_two_keys(cur, &rec_key, high_key);

		if (diff > 0)

			break;

fs/xfs/libxfs/xfs_defer.c

+4 −13
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ xfs_defer_trans_abort( 
	/* Abort intent items. */

	list_for_each_entry(dfp, &dop->dop_pending, dfp_list) {

		trace_xfs_defer_pending_abort(tp->t_mountp, dfp);

		if (dfp->dfp_committed)

		if (!dfp->dfp_done)

			dfp->dfp_type->abort_intent(dfp->dfp_intent);

	}
@@ -290,7 +290,6 @@ xfs_defer_finish( 
	struct xfs_defer_pending	*dfp;

	struct list_head		*li;

	struct list_head		*n;

	void				*done_item = NULL;

	void				*state;

	int				error = 0;

	void				(*cleanup_fn)(struct xfs_trans *, void *, int);
@@ -309,19 +308,11 @@ xfs_defer_finish( 
		if (error)

			goto out;



		/* Mark all pending intents as committed. */

		list_for_each_entry_reverse(dfp, &dop->dop_pending, dfp_list) {

			if (dfp->dfp_committed)

				break;

			trace_xfs_defer_pending_commit((*tp)->t_mountp, dfp);

			dfp->dfp_committed = true;

		}



		/* Log an intent-done item for the first pending item. */

		dfp = list_first_entry(&dop->dop_pending,

				struct xfs_defer_pending, dfp_list);

		trace_xfs_defer_pending_finish((*tp)->t_mountp, dfp);

		done_item = dfp->dfp_type->create_done(*tp, dfp->dfp_intent,

		dfp->dfp_done = dfp->dfp_type->create_done(*tp, dfp->dfp_intent,

				dfp->dfp_count);

		cleanup_fn = dfp->dfp_type->finish_cleanup;
@@ -331,7 +322,7 @@ xfs_defer_finish( 
			list_del(li);

			dfp->dfp_count--;

			error = dfp->dfp_type->finish_item(*tp, dop, li,

					done_item, &state);

					dfp->dfp_done, &state);

			if (error) {

				/*

				 * Clean up after ourselves and jump out.
@@ -428,8 +419,8 @@ xfs_defer_add( 
		dfp = kmem_alloc(sizeof(struct xfs_defer_pending),

				KM_SLEEP | KM_NOFS);

		dfp->dfp_type = defer_op_types[type];

		dfp->dfp_committed = false;

		dfp->dfp_intent = NULL;

		dfp->dfp_done = NULL;

		dfp->dfp_count = 0;

		INIT_LIST_HEAD(&dfp->dfp_work);

		list_add_tail(&dfp->dfp_list, &dop->dop_intake);

fs/xfs/libxfs/xfs_defer.h

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ struct xfs_defer_op_type; 
struct xfs_defer_pending {

	const struct xfs_defer_op_type	*dfp_type;	/* function pointers */

	struct list_head		dfp_list;	/* pending items */

	bool				dfp_committed;	/* committed trans? */

	void				*dfp_intent;	/* log intent item */

	void				*dfp_done;	/* log done item */

	struct list_head		dfp_work;	/* work items */

	unsigned int			dfp_count;	/* # extent items */

};