btrfs: move __btrfs_bio_end_io() code into its single caller

The __btrfs_bio_end_io() helper is trivial and has a single caller, so
there's no point in having a dedicated helper function. Further the double
underscore prefix in the name is discouraged. So get rid of it and move
its code into the caller (btrfs_bio_end_io()).

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index bc2555c44a120688c4571d8c0b8c30304ed3cdd4..94b9ab60bade3ce5351395a6887d254cf610b2be 100644 (file)
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -105,18 +105,6 @@ static void btrfs_cleanup_bio(struct btrfs_bio *bbio)
        bio_put(&bbio->bio);
 }
 
-static void __btrfs_bio_end_io(struct btrfs_bio *bbio)
-{
-       if (bbio_has_ordered_extent(bbio)) {
-               struct btrfs_ordered_extent *ordered = bbio->ordered;
-
-               bbio->end_io(bbio);
-               btrfs_put_ordered_extent(ordered);
-       } else {
-               bbio->end_io(bbio);
-       }
-}
-
 void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status)
 {
        bbio->bio.bi_status = status;
@@ -138,7 +126,15 @@ void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status)
                /* Load split bio's error which might be set above. */
                if (status == BLK_STS_OK)
                        bbio->bio.bi_status = READ_ONCE(bbio->status);
-               __btrfs_bio_end_io(bbio);
+
+               if (bbio_has_ordered_extent(bbio)) {
+                       struct btrfs_ordered_extent *ordered = bbio->ordered;
+
+                       bbio->end_io(bbio);
+                       btrfs_put_ordered_extent(ordered);
+               } else {
+                       bbio->end_io(bbio);
+               }
        }
 }