1 files changed, 7 insertions, 13 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 053109ba26b7..cc15514b4a76 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1724,6 +1724,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)
         bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
         bdi->congested_fn       = btrfs_congested_fn;
         bdi->congested_data     = info;
+        bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK;
         return 0;
 }
 
@@ -1744,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)
@@ -2608,7 +2609,6 @@ int open_ctree(struct super_block *sb,
 
 
         mutex_init(&fs_info->ordered_operations_mutex);
-        mutex_init(&fs_info->ordered_extent_flush_mutex);
         mutex_init(&fs_info->tree_log_mutex);
         mutex_init(&fs_info->chunk_mutex);
         mutex_init(&fs_info->transaction_kthread_mutex);
@@ -2950,8 +2950,9 @@ retry_root_backup:
         if (fs_info->fs_devices->missing_devices >
              fs_info->num_tolerated_disk_barrier_failures &&
             !(sb->s_flags & MS_RDONLY)) {
-                printk(KERN_WARNING "BTRFS: "
-                        "too many missing devices, writeable mount is not allowed\n");
+                pr_warn("BTRFS: missing devices(%llu) exceeds the limit(%d), writeable mount is not allowed\n",
+                        fs_info->fs_devices->missing_devices,
+                        fs_info->num_tolerated_disk_barrier_failures);
                 goto fail_sysfs;
         }
 
@@ -3326,11 +3327,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);
@@ -3358,11 +3356,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);