Commit 1fe4fd6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-6.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:

 - Remove some incorrect assertions

 - Fix compiler warnings about variables that could be static

 - Fix an off by one error when computing the maximum btree height that
   can cause repair failures

 - Fix the bulkstat-single ioctl not returning the root inode when asked
   to do that

 - Convey NOFS state to inodegc workers to avoid recursion in reclaim

 - Fix unnecessary variable initializations

 - Fix a bug that could result in corruption of the busy extent tree

* tag 'xfs-6.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix extent busy updating
  xfs: xfs_qm: remove unnecessary ‘0’ values from error
  xfs: Fix deadlock on xfs_inodegc_worker
  xfs: get root inode correctly at bulkstat
  xfs: fix off-by-one error in xfs_btree_space_to_height
  xfs: make xfs_iomap_page_ops static
  xfs: don't assert if cmap covers imap after cycling lock
parents b7bfaa76 601a27ea

fs/xfs/libxfs/xfs_btree.c

+6 −1
Original line number Diff line number Diff line
@@ -4666,7 +4666,12 @@ xfs_btree_space_to_height( 
	const unsigned int	*limits,

	unsigned long long	leaf_blocks)

{

	unsigned long long	node_blocks = limits[1];

	/*

	 * The root btree block can have fewer than minrecs pointers in it

	 * because the tree might not be big enough to require that amount of

	 * fanout. Hence it has a minimum size of 2 pointers, not limits[1].

	 */

	unsigned long long	node_blocks = 2;

	unsigned long long	blocks_left = leaf_blocks - 1;

	unsigned int		height = 1;

fs/xfs/xfs_extent_busy.c

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ xfs_extent_busy_update_extent( 
		 *

		 */

		busyp->bno = fend;

		busyp->length = bend - fend;

	} else if (bbno < fbno) {

		/*

		 * Case 8:

fs/xfs/xfs_icache.c

+10 −0
Original line number Diff line number Diff line
@@ -1853,12 +1853,20 @@ xfs_inodegc_worker( 
						struct xfs_inodegc, work);

	struct llist_node	*node = llist_del_all(&gc->list);

	struct xfs_inode	*ip, *n;

	unsigned int		nofs_flag;



	WRITE_ONCE(gc->items, 0);



	if (!node)

		return;



	/*

	 * We can allocate memory here while doing writeback on behalf of

	 * memory reclaim.  To avoid memory allocation deadlocks set the

	 * task-wide nofs context for the following operations.

	 */

	nofs_flag = memalloc_nofs_save();



	ip = llist_entry(node, struct xfs_inode, i_gclist);

	trace_xfs_inodegc_worker(ip->i_mount, READ_ONCE(gc->shrinker_hits));
@@ -1867,6 +1875,8 @@ xfs_inodegc_worker( 
		xfs_iflags_set(ip, XFS_INACTIVATING);

		xfs_inodegc_inactivate(ip);

	}



	memalloc_nofs_restore(nofs_flag);

}



/*

fs/xfs/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ xfs_bulkstat_fmt( 
static int

xfs_bulk_ireq_setup(

	struct xfs_mount	*mp,

	struct xfs_bulk_ireq	*hdr,

	const struct xfs_bulk_ireq *hdr,

	struct xfs_ibulk	*breq,

	void __user		*ubuffer)

{
@@ -780,7 +780,7 @@ xfs_bulk_ireq_setup( 


		switch (hdr->ino) {

		case XFS_BULK_IREQ_SPECIAL_ROOT:

			hdr->ino = mp->m_sb.sb_rootino;

			breq->startino = mp->m_sb.sb_rootino;

			break;

		default:

			return -EINVAL;

fs/xfs/xfs_iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ xfs_iomap_valid( 
	return true;

}



const struct iomap_page_ops xfs_iomap_page_ops = {

static const struct iomap_page_ops xfs_iomap_page_ops = {

	.iomap_valid		= xfs_iomap_valid,

};