4 files changed, 4 insertions, 6 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b306b3a88fc7..e7e7afb4a872 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2643,8 +2643,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
                 if (old_compressed)
                         contig = bio->bi_sector == sector;
                 else
-                        contig = bio->bi_sector + (bio->bi_size >> 9) ==
-                                sector;
+                        contig = bio_end_sector(bio) == sector;
 
                 if (prev_bio_flags != bio_flags || !contig ||
                     merge_bio(rw, tree, page, offset, page_size, bio, bio_flags) ||
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index b3e359bc8e68..4205ba752d40 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -24,6 +24,7 @@
 #include <linux/string.h>
 #include <linux/backing-dev.h>
 #include <linux/mpage.h>
+#include <linux/aio.h>
 #include <linux/falloc.h>
 #include <linux/swap.h>
 #include <linux/writeback.h>
@@ -1517,8 +1518,6 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
         size_t count, ocount;
         bool sync = (file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host);
 
-        sb_start_write(inode->i_sb);
-
         mutex_lock(&inode->i_mutex);
 
         err = generic_segment_checks(iov, &nr_segs, &ocount, VERIFY_READ);
@@ -1620,7 +1619,6 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
         if (sync)
                 atomic_dec(&BTRFS_I(inode)->sync_writers);
 out:
-        sb_end_write(inode->i_sb);
         current->backing_dev_info = NULL;
         return num_written ? num_written : err;
 }
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c931a4dbd031..17f3064b4a3e 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -32,6 +32,7 @@
 #include <linux/writeback.h>
 #include <linux/statfs.h>
 #include <linux/compat.h>
+#include <linux/aio.h>
 #include <linux/bit_spinlock.h>
 #include <linux/xattr.h>
 #include <linux/posix_acl.h>
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 24940085cdac..8bffb9174afb 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5164,7 +5164,7 @@ static int bio_size_ok(struct block_device *bdev, struct bio *bio,
         }
 
         prev = &bio->bi_io_vec[bio->bi_vcnt - 1];
-        if ((bio->bi_size >> 9) > max_sectors)
+        if (bio_sectors(bio) > max_sectors)
                 return 0;
 
         if (!q->merge_bvec_fn)