@@ -639,6 +639,7 @@ xfs_defer_ops_capture(
 	dfc = kmem_zalloc(sizeof(*dfc), KM_NOFS);
 	INIT_LIST_HEAD(&dfc->dfc_list);
 	INIT_LIST_HEAD(&dfc->dfc_dfops);
+	INIT_LIST_HEAD(&dfc->dfc_buffers);
 
 	xfs_defer_create_intents(tp);
 

@@ -690,7 +691,8 @@ int
 xfs_defer_ops_capture_and_commit(
 	struct xfs_trans		*tp,
 	struct xfs_inode		*capture_ip,
-	struct list_head		*capture_list)
+	struct list_head		*capture_list,
+	struct xfs_buf			*bp)
 {
 	struct xfs_mount		*mp = tp->t_mountp;
 	struct xfs_defer_capture	*dfc;

@@ -703,6 +705,9 @@ xfs_defer_ops_capture_and_commit(
 	if (!dfc)
 		return xfs_trans_commit(tp);
 
+	if (bp && bp->b_transp == tp)
+		list_add_tail(&bp->b_delay, &dfc->dfc_buffers);
+
 	/* Commit the transaction and add the capture structure to the list. */
 	error = xfs_trans_commit(tp);
 	if (error) {

@@ -74,6 +74,7 @@ struct xfs_defer_capture {
 
 	/* Deferred ops state saved from the transaction. */
 	struct list_head	dfc_dfops;
+	struct list_head	dfc_buffers;
 	unsigned int		dfc_tpflags;
 
 	/* Block reservations for the data and rt devices. */

@@ -95,7 +96,8 @@ struct xfs_defer_capture {
  * This doesn't normally happen except log recovery.
  */
 int xfs_defer_ops_capture_and_commit(struct xfs_trans *tp,
-		struct xfs_inode *capture_ip, struct list_head *capture_list);
+		struct xfs_inode *capture_ip, struct list_head *capture_list,
+		struct xfs_buf *bp);
 void xfs_defer_ops_continue(struct xfs_defer_capture *d, struct xfs_trans *tp,
 		struct xfs_inode **captured_ipp);
 void xfs_defer_ops_release(struct xfs_mount *mp, struct xfs_defer_capture *d);

@@ -532,7 +532,7 @@ xfs_bui_item_recover(
 	 * Commit transaction, which frees the transaction and saves the inode
 	 * for later replay activities.
 	 */
-	error = xfs_defer_ops_capture_and_commit(tp, ip, capture_list);
+	error = xfs_defer_ops_capture_and_commit(tp, ip, capture_list, NULL);
 	if (error)
 		goto err_unlock;
 

@@ -233,6 +233,7 @@ _xfs_buf_alloc(
 	init_completion(&bp->b_iowait);
 	INIT_LIST_HEAD(&bp->b_lru);
 	INIT_LIST_HEAD(&bp->b_list);
+	INIT_LIST_HEAD(&bp->b_delay);
 	INIT_LIST_HEAD(&bp->b_li_list);
 	sema_init(&bp->b_sema, 0); /* held, no waiters */
 	spin_lock_init(&bp->b_lock);

@@ -151,6 +151,7 @@ struct xfs_buf {
 	int			b_io_error;	/* internal IO error state */
 	wait_queue_head_t	b_waiters;	/* unpin waiters */
 	struct list_head	b_list;
+	struct list_head	b_delay;	/* delayed operations list */
 	struct xfs_perag	*b_pag;		/* contains rbtree root */
 	struct xfs_mount	*b_mount;
 	struct xfs_buftarg	*b_target;	/* buffer target (device) */

@@ -637,7 +637,7 @@ xfs_efi_item_recover(
 
 	}
 
-	return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list);
+	return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list, NULL);
 
 abort_error:
 	xfs_trans_cancel(tp);

@@ -2465,6 +2465,7 @@ xlog_finish_defer_ops(
 	struct list_head	*capture_list)
 {
 	struct xfs_defer_capture *dfc, *next;
+	struct xfs_buf		*bp, *bnext;
 	struct xfs_trans	*tp;
 	struct xfs_inode	*ip;
 	int			error = 0;

@@ -2489,6 +2490,12 @@ xlog_finish_defer_ops(
 			return error;
 		}
 
+		list_for_each_entry_safe(bp, bnext, &dfc->dfc_buffers, b_delay) {
+			xfs_trans_bjoin(tp, bp);
+			xfs_trans_bhold(tp, bp);
+			list_del_init(&bp->b_delay);
+		}
+
 		/*
 		 * Transfer to this new transaction all the dfops we captured
 		 * from recovering a single intent item.

@@ -557,7 +557,7 @@ xfs_cui_item_recover(
 	}
 
 	xfs_refcount_finish_one_cleanup(tp, rcur, error);
-	return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list);
+	return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list, NULL);
 
 abort_error:
 	xfs_refcount_finish_one_cleanup(tp, rcur, error);

@@ -587,7 +587,7 @@ xfs_rui_item_recover(
 	}
 
 	xfs_rmap_finish_one_cleanup(tp, rcur, error);
-	return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list);
+	return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list, NULL);
 
 abort_error:
 	xfs_rmap_finish_one_cleanup(tp, rcur, error);