btrfs: raid56: merge rbio_is_full helpers

There's only one call site of the unlocked helper so it can be folded
into the caller.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 339cce0878d1e233f7b39f1f5004e57b811251bf..272acd9b1192938b5f70e9d27fe4d7998f088cdc 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -507,32 +507,21 @@ static void run_xor(void **pages, int src_cnt, ssize_t len)
 }
 
 /*
- * returns true if the bio list inside this rbio
- * covers an entire stripe (no rmw required).
- * Must be called with the bio list lock held, or
- * at a time when you know it is impossible to add
- * new bios into the list
+ * Returns true if the bio list inside this rbio covers an entire stripe (no
+ * rmw required).
  */
-static int __rbio_is_full(struct btrfs_raid_bio *rbio)
+static int rbio_is_full(struct btrfs_raid_bio *rbio)
 {
+       unsigned long flags;
        unsigned long size = rbio->bio_list_bytes;
        int ret = 1;
 
+       spin_lock_irqsave(&rbio->bio_list_lock, flags);
        if (size != rbio->nr_data * rbio->stripe_len)
                ret = 0;
-
        BUG_ON(size > rbio->nr_data * rbio->stripe_len);
-       return ret;
-}
-
-static int rbio_is_full(struct btrfs_raid_bio *rbio)
-{
-       unsigned long flags;
-       int ret;
-
-       spin_lock_irqsave(&rbio->bio_list_lock, flags);
-       ret = __rbio_is_full(rbio);
        spin_unlock_irqrestore(&rbio->bio_list_lock, flags);
+
        return ret;
 }