|
@@ -7802,9 +7802,9 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip,
|
|
|
atomic_inc(&dip->pending_bios);
|
|
|
|
|
|
while (bvec <= (orig_bio->bi_io_vec + orig_bio->bi_vcnt - 1)) {
|
|
|
- if (unlikely(map_length < submit_len + bvec->bv_len ||
|
|
|
+ if (map_length < submit_len + bvec->bv_len ||
|
|
|
bio_add_page(bio, bvec->bv_page, bvec->bv_len,
|
|
|
- bvec->bv_offset) < bvec->bv_len)) {
|
|
|
+ bvec->bv_offset) < bvec->bv_len) {
|
|
|
/*
|
|
|
* inc the count before we submit the bio so
|
|
|
* we know the end IO handler won't happen before
|
|
@@ -8017,8 +8017,8 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
|
|
|
ret = btrfs_delalloc_reserve_space(inode, count);
|
|
|
if (ret)
|
|
|
goto out;
|
|
|
- } else if (unlikely(test_bit(BTRFS_INODE_READDIO_NEED_LOCK,
|
|
|
- &BTRFS_I(inode)->runtime_flags))) {
|
|
|
+ } else if (test_bit(BTRFS_INODE_READDIO_NEED_LOCK,
|
|
|
+ &BTRFS_I(inode)->runtime_flags)) {
|
|
|
inode_dio_done(inode);
|
|
|
flags = DIO_LOCKING | DIO_SKIP_HOLES;
|
|
|
wakeup = false;
|