From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Sep 2021 23:39:56 +0000 (+1000)
Subject: Merge remote-tracking branch 'xfs/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c6eb229de02d2a92b008b9696bb84a92f9b68544;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'xfs/for-next'
---

c6eb229de02d2a92b008b9696bb84a92f9b68544
diff --cc fs/xfs/xfs_inode.h
index e0ae905554e2,768f0d743158..b21b177832d1
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@@ -40,7 -40,9 +40,8 @@@ typedef struct xfs_inode 
  	/* Transaction and locking information. */
  	struct xfs_inode_log_item *i_itemp;	/* logging information */
  	mrlock_t		i_lock;		/* inode lock */
 -	mrlock_t		i_mmaplock;	/* inode mmap IO lock */
  	atomic_t		i_pincount;	/* inode pin count */
+ 	struct llist_node	i_gclist;	/* deferred inactivation list */
  
  	/*
  	 * Bitsets of inode metadata that have been checked and/or are sick.