Skip to content

Commit

Permalink
btrfs: raid56: merge rbio_is_full helpers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Sterba committed Aug 6, 2018
1 parent a81b747 commit 176571a
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions fs/btrfs/raid56.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 176571a

Please sign in to comment.