xfs: xfs_defer_capture should absorb remaining transaction reservation
When xfs_defer_capture extracts the deferred ops and transaction state
from a transaction, it should record the transaction reservation type
from the old transaction so that when we continue the dfops chain, we
still use the same reservation parameters.
This avoids a potential failure vector by ensuring that we never ask for
more log reservation space than we would have asked for had the system
not gone down.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index 7756cdf..aa1923b 100644
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -575,6 +575,11 @@
dfc->dfc_blkres = tp->t_blk_res - tp->t_blk_res_used;
tp->t_blk_res = tp->t_blk_res_used;
+ /* Preserve the transaction reservation type. */
+ dfc->dfc_tres.tr_logres = tp->t_log_res;
+ dfc->dfc_tres.tr_logcount = tp->t_log_count;
+ dfc->dfc_tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
+
return dfc;
}
diff --git a/libxfs/xfs_defer.h b/libxfs/xfs_defer.h
index 999adbb..063276c 100644
--- a/libxfs/xfs_defer.h
+++ b/libxfs/xfs_defer.h
@@ -77,6 +77,7 @@
struct list_head dfc_dfops;
unsigned int dfc_tpflags;
unsigned int dfc_blkres;
+ struct xfs_trans_res dfc_tres;
};
/*
