diff options
author | Lu Fengqi <lufq.fnst@cn.fujitsu.com> | 2018-10-11 01:40:33 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-10-15 11:23:40 -0400 |
commit | 5637c74b01458d4bc392c2bb721bd102f316ad2d (patch) | |
tree | 61267a6be7ba0922f0d2d1f4bd91f91b5c5be2c4 | |
parent | b90e22ba4804d31160f6cd625efa599ba9d286af (diff) |
btrfs: delayed-ref: pass delayed_refs directly to btrfs_select_ref_head
Since trans is only used for referring to delayed_refs, there is no need
to pass it instead of delayed_refs to btrfs_select_ref_head(). No
functional change.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/delayed-ref.c | 7 | ||||
-rw-r--r-- | fs/btrfs/delayed-ref.h | 4 | ||||
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 7f567c944fec..59a8c0565a24 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c | |||
@@ -353,16 +353,13 @@ int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq) | |||
353 | return ret; | 353 | return ret; |
354 | } | 354 | } |
355 | 355 | ||
356 | struct btrfs_delayed_ref_head * | 356 | struct btrfs_delayed_ref_head *btrfs_select_ref_head( |
357 | btrfs_select_ref_head(struct btrfs_trans_handle *trans) | 357 | struct btrfs_delayed_ref_root *delayed_refs) |
358 | { | 358 | { |
359 | struct btrfs_delayed_ref_root *delayed_refs; | ||
360 | struct btrfs_delayed_ref_head *head; | 359 | struct btrfs_delayed_ref_head *head; |
361 | u64 start; | 360 | u64 start; |
362 | bool loop = false; | 361 | bool loop = false; |
363 | 362 | ||
364 | delayed_refs = &trans->transaction->delayed_refs; | ||
365 | |||
366 | again: | 363 | again: |
367 | start = delayed_refs->run_delayed_start; | 364 | start = delayed_refs->run_delayed_start; |
368 | head = find_ref_head(delayed_refs, start, 1); | 365 | head = find_ref_head(delayed_refs, start, 1); |
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index c3e3486a126c..d664c99ce716 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h | |||
@@ -263,8 +263,8 @@ static inline void btrfs_delayed_ref_unlock(struct btrfs_delayed_ref_head *head) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | 265 | ||
266 | struct btrfs_delayed_ref_head * | 266 | struct btrfs_delayed_ref_head *btrfs_select_ref_head( |
267 | btrfs_select_ref_head(struct btrfs_trans_handle *trans); | 267 | struct btrfs_delayed_ref_root *delayed_refs); |
268 | 268 | ||
269 | int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq); | 269 | int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq); |
270 | 270 | ||
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index c4a1e8f028d3..5141fe67680b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2511,7 +2511,7 @@ static struct btrfs_delayed_ref_head *btrfs_obtain_ref_head( | |||
2511 | int ret; | 2511 | int ret; |
2512 | 2512 | ||
2513 | spin_lock(&delayed_refs->lock); | 2513 | spin_lock(&delayed_refs->lock); |
2514 | head = btrfs_select_ref_head(trans); | 2514 | head = btrfs_select_ref_head(delayed_refs); |
2515 | if (!head) { | 2515 | if (!head) { |
2516 | spin_unlock(&delayed_refs->lock); | 2516 | spin_unlock(&delayed_refs->lock); |
2517 | return head; | 2517 | return head; |