8 files changed, 10 insertions, 52 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2ef9a4b72d06..0bccf18dc1dc 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1745,7 +1745,7 @@ static void end_workqueue_fn(struct btrfs_work *work)
         bio->bi_private = end_io_wq->private;
         bio->bi_end_io = end_io_wq->end_io;
         kmem_cache_free(btrfs_end_io_wq_cache, end_io_wq);
-        bio_endio_nodec(bio, error);
+        bio_endio(bio, error);
 }
 
 static int cleaner_kthread(void *arg)
@@ -3269,11 +3269,8 @@ static int write_dev_supers(struct btrfs_device *device,
  */
 static void btrfs_end_empty_barrier(struct bio *bio, int err)
 {
-        if (err) {
-                if (err == -EOPNOTSUPP)
-                        set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);
+        if (err)
                 clear_bit(BIO_UPTODATE, &bio->bi_flags);
-        }
         if (bio->bi_private)
                 complete(bio->bi_private);
         bio_put(bio);
@@ -3301,11 +3298,7 @@ static int write_dev_flush(struct btrfs_device *device, int wait)
 
                 wait_for_completion(&device->flush_wait);
 
-                if (bio_flagged(bio, BIO_EOPNOTSUPP)) {
-                        printk_in_rcu("BTRFS: disabling barriers on dev %s\n",
-                                      rcu_str_deref(device->name));
-                        device->nobarriers = 1;
-                } else if (!bio_flagged(bio, BIO_UPTODATE)) {
+                if (!bio_flagged(bio, BIO_UPTODATE)) {
                         ret = -EIO;
                         btrfs_dev_stat_inc_and_print(device,
                                 BTRFS_DEV_STAT_FLUSH_ERRS);
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c32d226bfecc..c374e1e71e5f 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2767,8 +2767,6 @@ static int __must_check submit_one_bio(int rw, struct bio *bio,
         else
                 btrfsic_submit_bio(rw, bio);
 
-        if (bio_flagged(bio, BIO_EOPNOTSUPP))
-                ret = -EOPNOTSUPP;
         bio_put(bio);
         return ret;
 }
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 174f5e1e00ab..53af23f2c087 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -345,7 +345,7 @@ loop_lock:
                     waitqueue_active(&fs_info->async_submit_wait))
                         wake_up(&fs_info->async_submit_wait);
 
-                BUG_ON(atomic_read(&cur->bi_cnt) == 0);
+                BUG_ON(atomic_read(&cur->__bi_cnt) == 0);
 
                 /*
                  * if we're doing the sync list, record that our
@@ -5586,10 +5586,10 @@ int btrfs_rmap_block(struct btrfs_mapping_tree *map_tree,
 
 static inline void btrfs_end_bbio(struct btrfs_bio *bbio, struct bio *bio, int err)
 {
-        if (likely(bbio->flags & BTRFS_BIO_ORIG_BIO_SUBMITTED))
-                bio_endio_nodec(bio, err);
-        else
-                bio_endio(bio, err);
+        bio->bi_private = bbio->private;
+        bio->bi_end_io = bbio->end_io;
+        bio_endio(bio, err);
+
         btrfs_put_bbio(bbio);
 }
 
@@ -5633,8 +5633,6 @@ static void btrfs_end_bio(struct bio *bio, int err)
                         bio = bbio->orig_bio;
                 }
 
-                bio->bi_private = bbio->private;
-                bio->bi_end_io = bbio->end_io;
                 btrfs_io_bio(bio)->mirror_num = bbio->mirror_num;
                 /* only send an error to the higher layers if it is
                  * beyond the tolerance of the btrfs bio
@@ -5816,8 +5814,6 @@ static void bbio_error(struct btrfs_bio *bbio, struct bio *bio, u64 logical)
                 /* Shoud be the original bio. */
                 WARN_ON(bio != bbio->orig_bio);
 
-                bio->bi_private = bbio->private;
-                bio->bi_end_io = bbio->end_io;
                 btrfs_io_bio(bio)->mirror_num = bbio->mirror_num;
                 bio->bi_iter.bi_sector = logical >> 9;
 
@@ -5898,10 +5894,8 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
                 if (dev_nr < total_devs - 1) {
                         bio = btrfs_bio_clone(first_bio, GFP_NOFS);
                         BUG_ON(!bio); /* -ENOMEM */
-                } else {
+                } else
                         bio = first_bio;
-                        bbio->flags |= BTRFS_BIO_ORIG_BIO_SUBMITTED;
-                }
 
                 submit_stripe_bio(root, bbio, bio,
                                   bbio->stripes[dev_nr].physical, dev_nr, rw,
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index ebc31331a837..cedae0356558 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -292,8 +292,6 @@ struct btrfs_bio_stripe {
 struct btrfs_bio;
 typedef void (btrfs_bio_end_io_t) (struct btrfs_bio *bio, int err);
 
-#define BTRFS_BIO_ORIG_BIO_SUBMITTED    (1 << 0)
-
 struct btrfs_bio {
         atomic_t refs;
         atomic_t stripes_pending;
diff --git a/fs/buffer.c b/fs/buffer.c
index c7a5602d01ee..f96173ad62d9 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2938,10 +2938,6 @@ static void end_bio_bh_io_sync(struct bio *bio, int err)
 {
         struct buffer_head *bh = bio->bi_private;
 
-        if (err == -EOPNOTSUPP) {
-                set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);
-        }
-
         if (unlikely (test_bit(BIO_QUIET,&bio->bi_flags)))
                 set_bit(BH_Quiet, &bh->b_state);
 
@@ -3000,7 +2996,6 @@ void guard_bio_eod(int rw, struct bio *bio)
 int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags)
 {
         struct bio *bio;
-        int ret = 0;
 
         BUG_ON(!buffer_locked(bh));
         BUG_ON(!buffer_mapped(bh));
@@ -3041,14 +3036,8 @@ int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags)
         if (buffer_prio(bh))
                 rw |= REQ_PRIO;
 
-        bio_get(bio);
         submit_bio(rw, bio);
-
-        if (bio_flagged(bio, BIO_EOPNOTSUPP))
-                ret = -EOPNOTSUPP;
-
-        bio_put(bio);
-        return ret;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(_submit_bh);
 
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 79636e21d3a2..5602450f03f6 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -359,7 +359,6 @@ void ext4_io_submit(struct ext4_io_submit *io)
         if (bio) {
                 bio_get(io->io_bio);
                 submit_bio(io->io_op, io->io_bio);
-                BUG_ON(bio_flagged(io->io_bio, BIO_EOPNOTSUPP));
                 bio_put(io->io_bio);
         }
         io->io_bio = NULL;
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c
index dc3a9efdaab8..42468e5ab3e7 100644
--- a/fs/nilfs2/segbuf.c
+++ b/fs/nilfs2/segbuf.c
@@ -343,11 +343,6 @@ static void nilfs_end_bio_write(struct bio *bio, int err)
         const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
         struct nilfs_segment_buffer *segbuf = bio->bi_private;
 
-        if (err == -EOPNOTSUPP) {
-                set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);
-                /* to be detected by nilfs_segbuf_submit_bio() */
-        }
-
         if (!uptodate)
                 atomic_inc(&segbuf->sb_err);
 
@@ -374,15 +369,8 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf,
 
         bio->bi_end_io = nilfs_end_bio_write;
         bio->bi_private = segbuf;
-        bio_get(bio);
         submit_bio(mode, bio);
         segbuf->sb_nbio++;
-        if (bio_flagged(bio, BIO_EOPNOTSUPP)) {
-                bio_put(bio);
-                err = -EOPNOTSUPP;
-                goto failed;
-        }
-        bio_put(bio);
 
         wi->bio = NULL;
         wi->rest_blocks -= wi->end - wi->start;
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index a56960dd1684..095f94c2d8b5 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -356,7 +356,6 @@ xfs_end_bio(
 {
         xfs_ioend_t             *ioend = bio->bi_private;
 
-        ASSERT(atomic_read(&bio->bi_cnt) >= 1);
         ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error;
 
         /* Toss bio and pass work off to an xfsdatad thread */