--- fs/xfs/xfs_inode.c

+++ fs/xfs/xfs_inode.c

@@ -2877,8 +2877,8 @@ xfs_iflush(

mp = ip->i_mount;

/*

- * If the inode isn't dirty, then just release the inode

- * flush lock and do nothing.

+ * If the inode isn't dirty, then just release the inode flush lock and

+ * do nothing.

*/

if (xfs_inode_clean(ip)) {

xfs_ifunlock(ip);

@@ -2904,6 +2904,19 @@ xfs_iflush(

xfs_iunpin_wait(ip);

/*

+ * For stale inodes we cannot rely on the backing buffer remaining

+ * stale in cache for the remaining life of the stale inode and so

+ * xfs_itobp() below may give us a buffer that no longer contains

+ * inodes below. We have to check this after ensuring the inode is

+ * unpinned so that it is safe to reclaim the stale inode after the

+ * flush call.

+ */

+ if (xfs_iflags_test(ip, XFS_ISTALE)) {

+ xfs_ifunlock(ip);

+ return 0;

+ }

+

+ /*

* This may have been unpinned because the filesystem is shutting

* down forcibly. If that's the case we must not write this inode

* to disk, because the log record didn't make it to disk!