btrfs: fix error handling when submitting direct I/O bio

[platform/kernel/linux-starfive.git] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 259239b..b628c31 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7939,7 +7939,6 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip)
 
        /* bio split */
        ASSERT(geom.len <= INT_MAX);
-       atomic_inc(&dip->pending_bios);
        do {
                clone_len = min_t(int, submit_len, geom.len);
 
@@ -7989,7 +7988,8 @@ submit:
        if (!status)
                return 0;
 
-       bio_put(bio);
+       if (bio != orig_bio)
+               bio_put(bio);
 out_err:
        dip->errors = 1;
        /*
@@ -8030,7 +8030,7 @@ static void btrfs_submit_direct(struct bio *dio_bio, struct inode *inode,
        bio->bi_private = dip;
        dip->orig_bio = bio;
        dip->dio_bio = dio_bio;
-       atomic_set(&dip->pending_bios, 0);
+       atomic_set(&dip->pending_bios, 1);
        io_bio = btrfs_io_bio(bio);
        io_bio->logical = file_offset;