xfs: pass the xfs_defer_pending object to iop_recover

Now that log intent item recovery recreates the xfs_defer_pending state,
we should pass that into the ->iop_recover routines so that the intent
item can finish the recreation work.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index a32716b..6119a7a 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -545,9 +545,10 @@ xfs_attri_validate(
  */
 STATIC int
 xfs_attri_item_recover(
-       struct xfs_log_item             *lip,
+       struct xfs_defer_pending        *dfp,
        struct list_head                *capture_list)
 {
+       struct xfs_log_item             *lip = dfp->dfp_intent;
        struct xfs_attri_log_item       *attrip = ATTRI_ITEM(lip);
        struct xfs_attr_intent          *attr;
        struct xfs_mount                *mp = lip->li_log->l_mp;

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index 6cbae4f..3ef55de 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -486,11 +486,12 @@ xfs_bui_validate(
  */
 STATIC int
 xfs_bui_item_recover(
-       struct xfs_log_item             *lip,
+       struct xfs_defer_pending        *dfp,
        struct list_head                *capture_list)
 {
        struct xfs_bmap_intent          fake = { };
        struct xfs_trans_res            resv;
+       struct xfs_log_item             *lip = dfp->dfp_intent;
        struct xfs_bui_log_item         *buip = BUI_ITEM(lip);
        struct xfs_trans                *tp;
        struct xfs_inode                *ip = NULL;

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index cf0ddeb..a8245c5 100644 (file)
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -657,10 +657,11 @@ xfs_efi_validate_ext(
  */
 STATIC int
 xfs_efi_item_recover(
-       struct xfs_log_item             *lip,
+       struct xfs_defer_pending        *dfp,
        struct list_head                *capture_list)
 {
        struct xfs_trans_res            resv;
+       struct xfs_log_item             *lip = dfp->dfp_intent;
        struct xfs_efi_log_item         *efip = EFI_ITEM(lip);
        struct xfs_mount                *mp = lip->li_log->l_mp;
        struct xfs_efd_log_item         *efdp;

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index b9d2152..ff76821 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2583,7 +2583,7 @@ xlog_recover_process_intents(
                 * The recovery function can free the log item, so we must not
                 * access lip after it returns.
                 */
-               error = ops->iop_recover(lip, &capture_list);
+               error = ops->iop_recover(dfp, &capture_list);
                if (error) {
                        trace_xlog_intent_recovery_failed(log->l_mp, error,
                                        ops->iop_recover);

diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index b88cb2e..3456201 100644 (file)
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -474,10 +474,11 @@ xfs_cui_validate_phys(
  */
 STATIC int
 xfs_cui_item_recover(
-       struct xfs_log_item             *lip,
+       struct xfs_defer_pending        *dfp,
        struct list_head                *capture_list)
 {
        struct xfs_trans_res            resv;
+       struct xfs_log_item             *lip = dfp->dfp_intent;
        struct xfs_cui_log_item         *cuip = CUI_ITEM(lip);
        struct xfs_cud_log_item         *cudp;
        struct xfs_trans                *tp;

diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index c30d4a4..dfd5a3e 100644 (file)
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -504,10 +504,11 @@ xfs_rui_validate_map(
  */
 STATIC int
 xfs_rui_item_recover(
-       struct xfs_log_item             *lip,
+       struct xfs_defer_pending        *dfp,
        struct list_head                *capture_list)
 {
        struct xfs_trans_res            resv;
+       struct xfs_log_item             *lip = dfp->dfp_intent;
        struct xfs_rui_log_item         *ruip = RUI_ITEM(lip);
        struct xfs_rud_log_item         *rudp;
        struct xfs_trans                *tp;

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 6e3646d..4e38357 100644 (file)
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -66,6 +66,8 @@ struct xfs_log_item {
        { (1u << XFS_LI_DIRTY),         "DIRTY" }, \
        { (1u << XFS_LI_WHITEOUT),      "WHITEOUT" }
 
+struct xfs_defer_pending;
+
 struct xfs_item_ops {
        unsigned flags;
        void (*iop_size)(struct xfs_log_item *, int *, int *);
@@ -78,7 +80,7 @@ struct xfs_item_ops {
        xfs_lsn_t (*iop_committed)(struct xfs_log_item *, xfs_lsn_t);
        uint (*iop_push)(struct xfs_log_item *, struct list_head *);
        void (*iop_release)(struct xfs_log_item *);
-       int (*iop_recover)(struct xfs_log_item *lip,
+       int (*iop_recover)(struct xfs_defer_pending *dfp,
                           struct list_head *capture_list);
        bool (*iop_match)(struct xfs_log_item *item, uint64_t id);
        struct xfs_log_item *(*iop_relog)(struct xfs_log_item *intent,