aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6c4da8446397..fc9c0439caa3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7803,9 +7803,9 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip,
7803 atomic_inc(&dip->pending_bios); 7803 atomic_inc(&dip->pending_bios);
7804 7804
7805 while (bvec <= (orig_bio->bi_io_vec + orig_bio->bi_vcnt - 1)) { 7805 while (bvec <= (orig_bio->bi_io_vec + orig_bio->bi_vcnt - 1)) {
7806 if (unlikely(map_length < submit_len + bvec->bv_len || 7806 if (map_length < submit_len + bvec->bv_len ||
7807 bio_add_page(bio, bvec->bv_page, bvec->bv_len, 7807 bio_add_page(bio, bvec->bv_page, bvec->bv_len,
7808 bvec->bv_offset) < bvec->bv_len)) { 7808 bvec->bv_offset) < bvec->bv_len) {
7809 /* 7809 /*
7810 * inc the count before we submit the bio so 7810 * inc the count before we submit the bio so
7811 * we know the end IO handler won't happen before 7811 * we know the end IO handler won't happen before
@@ -8018,8 +8018,8 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
8018 ret = btrfs_delalloc_reserve_space(inode, count); 8018 ret = btrfs_delalloc_reserve_space(inode, count);
8019 if (ret) 8019 if (ret)
8020 goto out; 8020 goto out;
8021 } else if (unlikely(test_bit(BTRFS_INODE_READDIO_NEED_LOCK, 8021 } else if (test_bit(BTRFS_INODE_READDIO_NEED_LOCK,
8022 &BTRFS_I(inode)->runtime_flags))) { 8022 &BTRFS_I(inode)->runtime_flags)) {
8023 inode_dio_done(inode); 8023 inode_dio_done(inode);
8024 flags = DIO_LOCKING | DIO_SKIP_HOLES; 8024 flags = DIO_LOCKING | DIO_SKIP_HOLES;
8025 wakeup = false; 8025 wakeup = false;
@@ -9014,7 +9014,7 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
9014 spin_unlock(&root->delalloc_lock); 9014 spin_unlock(&root->delalloc_lock);
9015 9015
9016 work = btrfs_alloc_delalloc_work(inode, 0, delay_iput); 9016 work = btrfs_alloc_delalloc_work(inode, 0, delay_iput);
9017 if (unlikely(!work)) { 9017 if (!work) {
9018 if (delay_iput) 9018 if (delay_iput)
9019 btrfs_add_delayed_iput(inode); 9019 btrfs_add_delayed_iput(inode);
9020 else 9020 else