diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 3069194527dd06791d54cb74f865a663bb0b1624..0246dc3e8babb975911301b50327a4c90d674ca1 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2980,7 +2980,8 @@ xfs_validate_ag_length(
 	 * Only the last AG in the filesystem is allowed to be shorter
 	 * than the AG size recorded in the superblock.
 	 */
-	if (length != mp->m_sb.sb_agblocks) {
+	if (length != mp->m_sb.sb_agblocks &&
+		!(bp->b_flags & _XBF_LOGRECOVERY)) {
 		/*
 		 * During growfs, the new last AG can get here before we
 		 * have updated the superblock. Give it a pass on the seqno
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 003e157241da1e39a888f351f70d33b94f25e8b2..4f175540dd22444a8e8390fd4a612f07134f590b 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -554,6 +554,11 @@ xfs_buf_find_lock(
 		XFS_STATS_INC(bp->b_mount, xb_get_locked_waited);
 	}
 
+	if (xlog_is_shutdown(bp->b_mount->m_log)) {
+		xfs_buf_unlock(bp);
+		return -EIO;
+	}
+
 	/*
 	 * if the buffer is stale, clear all the external state associated with
 	 * it. We need to keep flags such as how we allocated the buffer memory
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 127b2410eb206fada51f272d6717b1e6f437b16a..c3897c5417f2a34d3ac3b2aa6ce341f385290b2e 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -711,9 +711,14 @@ xfs_inode_item_push(
 	if (xfs_iflags_test(ip, XFS_IFLUSHING))
 		return XFS_ITEM_FLUSHING;
 
-	if (!xfs_buf_trylock(bp))
+	if (!xfs_ilock_nowait(ip, XFS_ILOCK_SHARED))
 		return XFS_ITEM_LOCKED;
 
+	if (!xfs_buf_trylock(bp)) {
+		xfs_iunlock(ip, XFS_ILOCK_SHARED);
+		return XFS_ITEM_LOCKED;
+	}
+
 	spin_unlock(&lip->li_ailp->ail_lock);
 
 	/*
@@ -739,6 +744,7 @@ xfs_inode_item_push(
 	}
 
 	spin_lock(&lip->li_ailp->ail_lock);
+	xfs_iunlock(ip, XFS_ILOCK_SHARED);
 	return rval;
 }
 
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 8c0bfc9a33b116cd74606daa2d6de4fc8362f004..29f6ac670135f7ed2be53309ce58eea457fdae4b 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -1100,7 +1100,7 @@ xfs_trans_cancel(
 	 * progress, so we only need to check against the mount shutdown state
 	 * here.
 	 */
-	if (dirty && !xfs_is_shutdown(mp)) {
+	if (dirty && !(xfs_is_shutdown(mp) && xlog_is_shutdown(log))) {
 		XFS_ERROR_REPORT("xfs_trans_cancel", XFS_ERRLEVEL_LOW, mp);
 		xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
 	}