All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: David Sterba <dsterba@suse.cz>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>,
	linux-btrfs@vger.kernel.org, Josef Bacik <josef@toxicpanda.com>,
	Christoph Hellwig <hch@lst.de>
Subject: [PATCH v7 01/13] btrfs: re-add trans parameter to insert_delayed_ref
Date: Thu,  2 Mar 2023 01:45:23 -0800	[thread overview]
Message-ID: <f461b49660426b4ce56ff3f663e6495a572acc72.1677750131.git.johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <cover.1677750131.git.johannes.thumshirn@wdc.com>

Re-add the trans parameter to insert_delayed_ref as it is needed again
later in this series.

This reverts commit bccf28752a99 ("btrfs: drop trans parameter of insert_delayed_ref")

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
 fs/btrfs/delayed-ref.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 886ffb232eac..7660ac642c81 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -598,7 +598,8 @@ void btrfs_delete_ref_head(struct btrfs_delayed_ref_root *delayed_refs,
  * Return 0 for insert.
  * Return >0 for merge.
  */
-static int insert_delayed_ref(struct btrfs_delayed_ref_root *root,
+static int insert_delayed_ref(struct btrfs_trans_handle *trans,
+			      struct btrfs_delayed_ref_root *root,
 			      struct btrfs_delayed_ref_head *href,
 			      struct btrfs_delayed_ref_node *ref)
 {
@@ -974,7 +975,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
 	head_ref = add_delayed_ref_head(trans, head_ref, record,
 					action, &qrecord_inserted);
 
-	ret = insert_delayed_ref(delayed_refs, head_ref, &ref->node);
+	ret = insert_delayed_ref(trans, delayed_refs, head_ref, &ref->node);
 	spin_unlock(&delayed_refs->lock);
 
 	/*
@@ -1066,7 +1067,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
 	head_ref = add_delayed_ref_head(trans, head_ref, record,
 					action, &qrecord_inserted);
 
-	ret = insert_delayed_ref(delayed_refs, head_ref, &ref->node);
+	ret = insert_delayed_ref(trans, delayed_refs, head_ref, &ref->node);
 	spin_unlock(&delayed_refs->lock);
 
 	/*
-- 
2.39.1


  reply	other threads:[~2023-03-02  9:46 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-02  9:45 [PATCH v7 00/13] btrfs: introduce RAID stripe tree Johannes Thumshirn
2023-03-02  9:45 ` Johannes Thumshirn [this message]
2023-03-02 13:36   ` [PATCH v7 01/13] btrfs: re-add trans parameter to insert_delayed_ref Anand Jain
2023-03-02  9:45 ` [PATCH v7 02/13] btrfs: add raid stripe tree definitions Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 03/13] btrfs: read raid-stripe-tree from disk Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 04/13] btrfs: add support for inserting raid stripe extents Johannes Thumshirn
2023-03-02 10:58   ` Qu Wenruo
2023-03-02 11:25     ` Johannes Thumshirn
2023-03-02 11:45       ` Qu Wenruo
2023-03-02 11:58         ` Johannes Thumshirn
2023-03-02 12:01           ` Qu Wenruo
2023-03-02 14:01           ` Christoph Hellwig
2023-03-02 15:31             ` Johannes Thumshirn
2023-03-02 22:35               ` Qu Wenruo
2023-03-03 11:15                 ` Johannes Thumshirn
2023-03-03 11:42                   ` Qu Wenruo
2023-03-03 14:21                     ` hch
2023-03-06 10:58                       ` Johannes Thumshirn
2023-03-03 14:17                   ` hch
2023-03-03 14:16                 ` hch
2023-03-08  9:11                   ` Johannes Thumshirn
2023-03-08 12:01                     ` Qu Wenruo
2023-03-08 14:33                     ` Christoph Hellwig
2023-03-09 10:53                       ` Johannes Thumshirn
2023-03-09 15:20                         ` Christoph Hellwig
2023-03-03 14:15               ` hch
2023-03-02 11:45       ` Johannes Thumshirn
2023-03-02 14:03         ` Christoph Hellwig
2023-03-02 13:59       ` Christoph Hellwig
2023-03-02 15:29         ` Johannes Thumshirn
2023-03-03  0:13         ` Qu Wenruo
2023-03-03 14:15           ` Christoph Hellwig
2023-03-03 23:03             ` Qu Wenruo
2023-03-06 17:11               ` Christoph Hellwig
2023-03-02  9:45 ` [PATCH v7 05/13] btrfs: delete stripe extent on extent deletion Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 06/13] btrfs: lookup physical address from stripe extent Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 07/13] btrfs: add raid stripe tree pretty printer Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 08/13] btrfs: zoned: allow zoned RAID Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 09/13] btrfs: check for leaks of ordered stripes on umount Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 10/13] btrfs: add tracepoints for ordered stripes Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 11/13] btrfs: announce presence of raid-stripe-tree in sysfs Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 12/13] btrfs: consult raid-stripe-tree when scrubbing Johannes Thumshirn
2023-03-02  9:45 ` [PATCH v7 13/13] btrfs: add raid-stripe-tree to features enabled with debug Johannes Thumshirn
2023-03-03 23:27   ` Anand Jain
2023-03-09  7:08   ` Naohiro Aota
2023-03-02 19:38 ` [PATCH v7 00/13] btrfs: introduce RAID stripe tree Neal Gompa
2023-03-03  8:45   ` Johannes Thumshirn
2023-03-03  9:29 ` Anand Jain
2023-03-03 10:32   ` Johannes Thumshirn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f461b49660426b4ce56ff3f663e6495a572acc72.1677750131.git.johannes.thumshirn@wdc.com \
    --to=johannes.thumshirn@wdc.com \
    --cc=dsterba@suse.cz \
    --cc=hch@lst.de \
    --cc=josef@toxicpanda.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.