btrfs: Remove unused readahead spinlock

The reada_lock in struct btrfs_device was only initialised, and not
actually used.  That's good because there's another lock also called
reada_lock in the btrfs_fs_info that was quite heavily used.  Remove
this one.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 11fccf2fcb1f386ee29ac6cda9a9c0da7246e23c..5750cd9df417ea2ae744c41c696aad24e61325ca 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -319,7 +319,6 @@ static struct btrfs_device *__alloc_device(void)
 
        spin_lock_init(&dev->io_lock);
 
-       spin_lock_init(&dev->reada_lock);
        atomic_set(&dev->reada_in_flight, 0);
        atomic_set(&dev->dev_stats_ccnt, 0);
        btrfs_device_data_ordered_init(dev);

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 15216fed918bfeb3a77375ea1593c62991d0bf07..28c28eeadff39da01f697b870b545c79291e37dd 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -137,7 +137,6 @@ struct btrfs_device {
        struct rcu_head rcu;
 
        /* readahead state */
-       spinlock_t reada_lock;
        atomic_t reada_in_flight;
        u64 reada_next;
        struct reada_zone *reada_curr_zone;