btrfs: Remove unused btrfs_is_parity_mirror
Subsystems (2)
PATCH 1/1 btrfs: Remove unused btrfs_is_parity_mirror
From: "Dr. David Alan Gilbert" <[email protected]>
btrfs_is_parity_mirror() has been unused since commit 4886ff7b50f6 ("btrfs: introduce a new helper to submit write bio for repair")
Remove it.
--- fs/btrfs/volumes.c | 18 ------------------ fs/btrfs/volumes.h | 2 -- 2 files changed, 20 deletions(-)
fs/btrfs/volumes.c +0 -18
@@ -5841,24 +5841,6 @@ unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,return len; } -int btrfs_is_parity_mirror (struct btrfs_fs_info *fs_info,u64 logical,u64 len) -{ -struct btrfs_chunk_map *map; -int ret =0 ; - -if (!btrfs_fs_incompat (fs_info,RAID56 )) -return 0 ; - - map =btrfs_get_chunk_map (fs_info, logical, len); - -if (!WARN_ON (IS_ERR (map))) { -if (map->type &BTRFS_BLOCK_GROUP_RAID56_MASK ) - ret =1 ; -btrfs_free_chunk_map (map); - } -return ret; -} -static int find_live_mirror (struct btrfs_fs_info *fs_info,struct btrfs_chunk_map *map,int first,int dev_replace_is_ongoing)
fs/btrfs/volumes.h +0 -2
@@ -735,8 +735,6 @@ int btrfs_run_dev_stats(struct btrfs_trans_handle *trans);void btrfs_rm_dev_replace_remove_srcdev (struct btrfs_device *srcdev);void btrfs_rm_dev_replace_free_srcdev (struct btrfs_device *srcdev);void btrfs_destroy_dev_replace_tgtdev (struct btrfs_device *tgtdev); -int btrfs_is_parity_mirror (struct btrfs_fs_info *fs_info, -u64 logical,u64 len);unsigned long btrfs_full_stripe_len (struct btrfs_fs_info *fs_info,u64 logical);u64 btrfs_calc_stripe_length (const struct btrfs_chunk_map *map);
Signature · 1 line
2.46.2
PATCH 1/1 btrfs: Remove unused btrfs_try_tree_write_lock
From: "Dr. David Alan Gilbert" <[email protected]>
btrfs_try_tree_write_lock() is unused since commit 50b21d7a066f ("btrfs: submit a writeback bio per extent_buffer")
Remove it (and it's associated trace).
--- fs/btrfs/locking.c | 15 --------------- fs/btrfs/locking.h | 1 - include/trace/events/btrfs.h | 1 - 3 files changed, 17 deletions(-)
fs/btrfs/locking.c +0 -15
@@ -161,21 +161,6 @@ int btrfs_try_tree_read_lock(struct extent_buffer *eb)return 0 ; } -/* -* Try-lock for write. -* -* Return 1 if the rwlock has been taken, 0 otherwise -*/ -int btrfs_try_tree_write_lock (struct extent_buffer *eb) -{ -if (down_write_trylock (&eb->lock)) { -btrfs_set_eb_lock_owner (eb, current->pid); -trace_btrfs_try_tree_write_lock (eb); -return 1 ; - } -return 0 ; -} -/* * Release read lock. */
fs/btrfs/locking.h +0 -1
@@ -180,7 +180,6 @@ static inline void btrfs_tree_read_lock(struct extent_buffer *eb)void btrfs_tree_read_unlock (struct extent_buffer *eb);int btrfs_try_tree_read_lock (struct extent_buffer *eb); -int btrfs_try_tree_write_lock (struct extent_buffer *eb);struct extent_buffer *btrfs_lock_root_node (struct btrfs_root *root);struct extent_buffer *btrfs_read_lock_root_node (struct btrfs_root *root);struct extent_buffer *btrfs_try_read_lock_root_node (struct btrfs_root *root);
include/trace/events/btrfs.h +0 -1
@@ -2341,7 +2341,6 @@ DEFINE_BTRFS_LOCK_EVENT(btrfs_tree_read_unlock_blocking);DEFINE_BTRFS_LOCK_EVENT (btrfs_set_lock_blocking_read);DEFINE_BTRFS_LOCK_EVENT (btrfs_set_lock_blocking_write);DEFINE_BTRFS_LOCK_EVENT (btrfs_try_tree_read_lock); -DEFINE_BTRFS_LOCK_EVENT (btrfs_try_tree_write_lock);DEFINE_BTRFS_LOCK_EVENT (btrfs_tree_read_lock_atomic); DECLARE_EVENT_CLASS(btrfs__space_info_update,
Signature · 1 line
2.46.2
Re: [PATCH] btrfs: Remove unused btrfs_try_tree_write_lock
Quoted 6 lines · On Thu, Oct 03, 2024 at 03:27:27PM +0100, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
btrfs_try_tree_write_lock()is unused since commit50b21d7a066f("btrfs: submit a writeback bio perextent_buffer")Remove it (and it's associated trace).
Looks good:
Re: [PATCH] btrfs: Remove unused btrfs_try_tree_write_lock
In reply to [email protected]Quoted 8 lines · 在 2024/10/3 23:57, [email protected] 写道:
From: "Dr. David Alan Gilbert" <[email protected]>
btrfs_try_tree_write_lock()is unused since commit50b21d7a066f("btrfs: submit a writeback bio perextent_buffer")Remove it (and it's associated trace).
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Thanks,
Qu
Quoted 56 lines
--- fs/btrfs/locking.c | 15 --------------- fs/btrfs/locking.h | 1 - include/trace/events/btrfs.h | 1 - 3 files changed, 17 deletions(-)fs/btrfs/locking.c +0
-15@@ -161,21 +161,6 @@ int btrfs_try_tree_read_lock(struct extent_buffer *eb)return 0 ; } -/* -* Try-lock for write. -* -* Return 1 if the rwlock has been taken, 0 otherwise -*/ -int btrfs_try_tree_write_lock (struct extent_buffer *eb) -{ -if (down_write_trylock (&eb->lock)) { -btrfs_set_eb_lock_owner (eb, current->pid); -trace_btrfs_try_tree_write_lock (eb); -return 1 ; - } -return 0 ; -} -/* * Release read lock. */ fs/btrfs/locking.h +0
-1@@ -180,7 +180,6 @@ static inline void btrfs_tree_read_lock(struct extent_buffer *eb)void btrfs_tree_read_unlock (struct extent_buffer *eb);int btrfs_try_tree_read_lock (struct extent_buffer *eb); -int btrfs_try_tree_write_lock (struct extent_buffer *eb);struct extent_buffer *btrfs_lock_root_node (struct btrfs_root *root);struct extent_buffer *btrfs_read_lock_root_node (struct btrfs_root *root);struct extent_buffer *btrfs_try_read_lock_root_node (struct btrfs_root *root);include/trace/events/btrfs.h +0
-1@@ -2341,7 +2341,6 @@ DEFINE_BTRFS_LOCK_EVENT(btrfs_tree_read_unlock_blocking);DEFINE_BTRFS_LOCK_EVENT (btrfs_set_lock_blocking_read);DEFINE_BTRFS_LOCK_EVENT (btrfs_set_lock_blocking_write);DEFINE_BTRFS_LOCK_EVENT (btrfs_try_tree_read_lock); -DEFINE_BTRFS_LOCK_EVENT (btrfs_try_tree_write_lock);DEFINE_BTRFS_LOCK_EVENT (btrfs_tree_read_lock_atomic); DECLARE_EVENT_CLASS(btrfs__space_info_update,
Quoted 8 lines · 在 2024/10/3 23:57, [email protected] 写道:
From: "Dr. David Alan Gilbert" <[email protected]>
btrfs_is_parity_mirror()has been unused since commit4886ff7b50f6("btrfs: introduce a new helper to submit write bio for repair")Remove it.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Thanks,
Qu
Quoted 47 lines
--- fs/btrfs/volumes.c | 18 ------------------ fs/btrfs/volumes.h | 2 -- 2 files changed, 20 deletions(-)fs/btrfs/volumes.c +0
-18@@ -5841,24 +5841,6 @@ unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,return len; } -int btrfs_is_parity_mirror (struct btrfs_fs_info *fs_info,u64 logical,u64 len) -{ -struct btrfs_chunk_map *map; -int ret =0 ; - -if (!btrfs_fs_incompat (fs_info,RAID56 )) -return 0 ; - - map =btrfs_get_chunk_map (fs_info, logical, len); - -if (!WARN_ON (IS_ERR (map))) { -if (map->type &BTRFS_BLOCK_GROUP_RAID56_MASK ) - ret =1 ; -btrfs_free_chunk_map (map); - } -return ret; -} -static int find_live_mirror (struct btrfs_fs_info *fs_info,struct btrfs_chunk_map *map,int first,int dev_replace_is_ongoing)fs/btrfs/volumes.h +0
-2@@ -735,8 +735,6 @@ int btrfs_run_dev_stats(struct btrfs_trans_handle *trans);void btrfs_rm_dev_replace_remove_srcdev (struct btrfs_device *srcdev);void btrfs_rm_dev_replace_free_srcdev (struct btrfs_device *srcdev);void btrfs_destroy_dev_replace_tgtdev (struct btrfs_device *tgtdev); -int btrfs_is_parity_mirror (struct btrfs_fs_info *fs_info, -u64 logical,u64 len);unsigned long btrfs_full_stripe_len (struct btrfs_fs_info *fs_info,u64 logical);u64 btrfs_calc_stripe_length (const struct btrfs_chunk_map *map);