btrfs: Remove unused locking functions

Those were split out of btrfs_clear_lock_blocking_rw by
aa12c02778a9 ("btrfs: split btrfs_clear_lock_blocking_rw to read and write helpers")
however at that time this function was unused due to commit
523983401644 ("Btrfs: kill btrfs_clear_path_blocking"). Put the final
nail in the coffin of those 2 functions.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 393eceda57c8a2d8d31eb3e4b5e45db3fe697c32..e4309bcf0b5f243ad32ffdb2d271d87918eb0fe0 100644 (file)
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -119,42 +119,6 @@ void btrfs_set_lock_blocking_write(struct extent_buffer *eb)
        }
 }
 
-void btrfs_clear_lock_blocking_read(struct extent_buffer *eb)
-{
-       trace_btrfs_clear_lock_blocking_read(eb);
-       /*
-        * No lock is required.  The lock owner may change if we have a read
-        * lock, but it won't change to or away from us.  If we have the write
-        * lock, we are the owner and it'll never change.
-        */
-       if (eb->lock_nested && current->pid == eb->lock_owner)
-               return;
-       BUG_ON(atomic_read(&eb->blocking_readers) == 0);
-       read_lock(&eb->lock);
-       btrfs_assert_spinning_readers_get(eb);
-       /* atomic_dec_and_test implies a barrier */
-       if (atomic_dec_and_test(&eb->blocking_readers))
-               cond_wake_up_nomb(&eb->read_lock_wq);
-}
-
-void btrfs_clear_lock_blocking_write(struct extent_buffer *eb)
-{
-       trace_btrfs_clear_lock_blocking_write(eb);
-       /*
-        * no lock is required.  The lock owner may change if
-        * we have a read lock, but it won't change to or away
-        * from us.  If we have the write lock, we are the owner
-        * and it'll never change.
-        */
-       if (eb->lock_nested && current->pid == eb->lock_owner)
-               return;
-       write_lock(&eb->lock);
-       BUG_ON(eb->blocking_writers != 1);
-       btrfs_assert_spinning_writers_get(eb);
-       if (--eb->blocking_writers == 0)
-               cond_wake_up(&eb->write_lock_wq);
-}
-
 /*
  * take a spinning read lock.  This will wait for any blocking
  * writers

diff --git a/fs/btrfs/locking.h b/fs/btrfs/locking.h
index 595014f64830f822d6d9135641e528353fdfe4f3..b775a4207ed9126a1d8315a380cee6d847297d18 100644 (file)
--- a/fs/btrfs/locking.h
+++ b/fs/btrfs/locking.h
@@ -19,8 +19,6 @@ void btrfs_tree_read_unlock(struct extent_buffer *eb);
 void btrfs_tree_read_unlock_blocking(struct extent_buffer *eb);
 void btrfs_set_lock_blocking_read(struct extent_buffer *eb);
 void btrfs_set_lock_blocking_write(struct extent_buffer *eb);
-void btrfs_clear_lock_blocking_read(struct extent_buffer *eb);
-void btrfs_clear_lock_blocking_write(struct extent_buffer *eb);
 void btrfs_assert_tree_locked(struct extent_buffer *eb);
 int btrfs_try_tree_read_lock(struct extent_buffer *eb);
 int btrfs_try_tree_write_lock(struct extent_buffer *eb);

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 2f6a669408bbd85d2bdc31787f0d59b896f9c03f..5cb95646b94ec585aff94bee91e9ea34ef1c929e 100644 (file)
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -2086,8 +2086,6 @@ DEFINE_BTRFS_LOCK_EVENT(btrfs_tree_read_unlock);
 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_clear_lock_blocking_read);
-DEFINE_BTRFS_LOCK_EVENT(btrfs_clear_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);