From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Cc: Nikolay Borisov <nborisov@suse.com>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH 02/24] btrfs: remove orig from shrink_delalloc
Date: Mon, 3 Feb 2020 15:49:29 -0500 [thread overview]
Message-ID: <20200203204951.517751-3-josef@toxicpanda.com> (raw)
In-Reply-To: <20200203204951.517751-1-josef@toxicpanda.com>
We don't use this anywhere inside of shrink_delalloc, remove it.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/space-info.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index edda1ee0455e..671c3a379224 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -350,7 +350,7 @@ static inline u64 calc_reclaim_items_nr(struct btrfs_fs_info *fs_info,
* shrink metadata reservation for delalloc
*/
static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim,
- u64 orig, bool wait_ordered)
+ bool wait_ordered)
{
struct btrfs_space_info *space_info;
struct btrfs_trans_handle *trans;
@@ -569,7 +569,7 @@ static void flush_space(struct btrfs_fs_info *fs_info,
break;
case FLUSH_DELALLOC:
case FLUSH_DELALLOC_WAIT:
- shrink_delalloc(fs_info, num_bytes * 2, num_bytes,
+ shrink_delalloc(fs_info, num_bytes * 2,
state == FLUSH_DELALLOC_WAIT);
break;
case FLUSH_DELAYED_REFS_NR:
--
2.24.1
next prev parent reply other threads:[~2020-02-03 20:50 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 20:49 [PATCH 00/24][v3] Convert data reservations to the ticketing infrastructure Josef Bacik
2020-02-03 20:49 ` [PATCH 01/24] btrfs: change nr to u64 in btrfs_start_delalloc_roots Josef Bacik
2020-02-04 7:40 ` Nikolay Borisov
2020-02-03 20:49 ` Josef Bacik [this message]
2020-02-03 20:49 ` [PATCH 03/24] btrfs: handle U64_MAX for shrink_delalloc Josef Bacik
2020-02-03 20:49 ` [PATCH 04/24] btrfs: make shrink_delalloc take space_info as an arg Josef Bacik
2020-02-03 20:49 ` [PATCH 05/24] btrfs: make ALLOC_CHUNK use the space info flags Josef Bacik
2020-02-03 20:49 ` [PATCH 06/24] btrfs: call btrfs_try_granting_tickets when freeing reserved bytes Josef Bacik
2020-02-03 20:49 ` [PATCH 07/24] btrfs: call btrfs_try_granting_tickets when unpinning anything Josef Bacik
2020-02-03 20:49 ` [PATCH 08/24] btrfs: call btrfs_try_granting_tickets when reserving space Josef Bacik
2020-02-03 20:49 ` [PATCH 09/24] btrfs: use the btrfs_space_info_free_bytes_may_use helper for delalloc Josef Bacik
2020-02-03 20:49 ` [PATCH 10/24] btrfs: use btrfs_start_delalloc_roots in shrink_delalloc Josef Bacik
2020-02-03 20:49 ` [PATCH 11/24] btrfs: check tickets after waiting on ordered extents Josef Bacik
2020-02-03 20:49 ` [PATCH 12/24] btrfs: add flushing states for handling data reservations Josef Bacik
2020-02-03 20:49 ` [PATCH 13/24] btrfs: add the data transaction commit logic into may_commit_transaction Josef Bacik
2020-02-03 20:49 ` [PATCH 14/24] btrfs: add btrfs_reserve_data_bytes and use it Josef Bacik
2020-02-03 20:49 ` [PATCH 15/24] btrfs: use ticketing for data space reservations Josef Bacik
2020-02-03 20:49 ` [PATCH 16/24] btrfs: serialize data reservations if we are flushing Josef Bacik
2020-02-03 20:49 ` [PATCH 17/24] btrfs: use the same helper for data and metadata reservations Josef Bacik
2020-02-03 20:49 ` [PATCH 18/24] btrfs: drop the commit_cycles stuff for data reservations Josef Bacik
2020-02-04 7:39 ` Nikolay Borisov
2020-02-03 20:49 ` [PATCH 19/24] btrfs: don't pass bytes_needed to may_commit_transaction Josef Bacik
2020-02-04 7:42 ` Nikolay Borisov
2020-02-03 20:49 ` [PATCH 20/24] btrfs: don't force commit if we are data Josef Bacik
2020-02-04 7:43 ` Nikolay Borisov
2020-02-03 20:49 ` [PATCH 21/24] btrfs: run delayed iputs before committing the transaction for data Josef Bacik
2020-02-04 7:43 ` Nikolay Borisov
2020-02-03 20:49 ` [PATCH 22/24] btrfs: flush delayed refs when trying to reserve data space Josef Bacik
2020-02-03 20:49 ` [PATCH 23/24] btrfs: do async reclaim for data reservations Josef Bacik
2020-02-03 20:49 ` [PATCH 24/24] btrfs: add a comment explaining the data flush steps Josef Bacik
2020-02-04 9:47 ` Nikolay Borisov
2020-02-04 16:16 ` Josef Bacik
2020-02-04 9:48 ` [PATCH 00/24][v3] Convert data reservations to the ticketing infrastructure Nikolay Borisov
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=20200203204951.517751-3-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=johannes.thumshirn@wdc.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox