Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into HEAD

1 files changed, 19 insertions, 31 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index a7ffc88a7dbe..b0d49e21b0b1 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1153,7 +1153,6 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
         root->orphan_block_rsv = NULL;
 
         INIT_LIST_HEAD(&root->dirty_list);
-        INIT_LIST_HEAD(&root->orphan_list);
         INIT_LIST_HEAD(&root->root_list);
         spin_lock_init(&root->orphan_lock);
         spin_lock_init(&root->inode_lock);
@@ -1166,6 +1165,7 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
         atomic_set(&root->log_commit[0], 0);
         atomic_set(&root->log_commit[1], 0);
         atomic_set(&root->log_writers, 0);
+        atomic_set(&root->orphan_inodes, 0);
         root->log_batch = 0;
         root->log_transid = 0;
         root->last_log_commit = 0;
@@ -2001,7 +2001,8 @@ int open_ctree(struct super_block *sb,
         BTRFS_I(fs_info->btree_inode)->root = tree_root;
         memset(&BTRFS_I(fs_info->btree_inode)->location, 0,
                sizeof(struct btrfs_key));
-        BTRFS_I(fs_info->btree_inode)->dummy_inode = 1;
+        set_bit(BTRFS_INODE_DUMMY,
+                &BTRFS_I(fs_info->btree_inode)->runtime_flags);
         insert_inode_hash(fs_info->btree_inode);
 
         spin_lock_init(&fs_info->block_group_cache_lock);
@@ -2353,6 +2354,13 @@ retry_root_backup:
         fs_info->generation = generation;
         fs_info->last_trans_committed = generation;
 
+        ret = btrfs_init_dev_stats(fs_info);
+        if (ret) {
+                printk(KERN_ERR "btrfs: failed to init dev_stats: %d\n",
+                       ret);
+                goto fail_block_groups;
+        }
+
         ret = btrfs_init_space_info(fs_info);
         if (ret) {
                 printk(KERN_ERR "Failed to initial space info: %d\n", ret);
@@ -2556,18 +2564,19 @@ recovery_tree_root:
 
 static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate)
 {
-        char b[BDEVNAME_SIZE];
-
         if (uptodate) {
                 set_buffer_uptodate(bh);
         } else {
+                struct btrfs_device *device = (struct btrfs_device *)
+                        bh->b_private;
+
                 printk_ratelimited(KERN_WARNING "lost page write due to "
-                                        "I/O error on %s\n",
-                                       bdevname(bh->b_bdev, b));
+                                   "I/O error on %s\n", device->name);
                 /* note, we dont' set_buffer_write_io_error because we have
                  * our own ways of dealing with the IO errors
                  */
                 clear_buffer_uptodate(bh);
+                btrfs_dev_stat_inc_and_print(device, BTRFS_DEV_STAT_WRITE_ERRS);
         }
         unlock_buffer(bh);
         put_bh(bh);
@@ -2682,6 +2691,7 @@ static int write_dev_supers(struct btrfs_device *device,
                         set_buffer_uptodate(bh);
                         lock_buffer(bh);
                         bh->b_end_io = btrfs_end_buffer_write_sync;
+                        bh->b_private = device;
                 }
 
                 /*
@@ -2740,6 +2750,9 @@ static int write_dev_flush(struct btrfs_device *device, int wait)
                 }
                 if (!bio_flagged(bio, BIO_UPTODATE)) {
                         ret = -EIO;
+                        if (!bio_flagged(bio, BIO_EOPNOTSUPP))
+                                btrfs_dev_stat_inc_and_print(device,
+                                        BTRFS_DEV_STAT_FLUSH_ERRS);
                 }
 
                 /* drop the reference from the wait == 0 run */
@@ -2902,19 +2915,6 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
         return ret;
 }
 
-/* Kill all outstanding I/O */
-void btrfs_abort_devices(struct btrfs_root *root)
-{
-        struct list_head *head;
-        struct btrfs_device *dev;
-        mutex_lock(&root->fs_info->fs_devices->device_list_mutex);
-        head = &root->fs_info->fs_devices->devices;
-        list_for_each_entry_rcu(dev, head, dev_list) {
-                blk_abort_queue(dev->bdev->bd_disk->queue);
-        }
-        mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
-}
-
 void btrfs_free_fs_root(struct btrfs_fs_info *fs_info, struct btrfs_root *root)
 {
         spin_lock(&fs_info->fs_roots_radix_lock);
@@ -3671,17 +3671,6 @@ int btrfs_cleanup_transaction(struct btrfs_root *root)
         return 0;
 }
 
-static int btree_writepage_io_failed_hook(struct bio *bio, struct page *page,
-                                          u64 start, u64 end,
-                                          struct extent_state *state)
-{
-        struct super_block *sb = page->mapping->host->i_sb;
-        struct btrfs_fs_info *fs_info = btrfs_sb(sb);
-        btrfs_error(fs_info, -EIO,
-                    "Error occured while writing out btree at %llu", start);
-        return -EIO;
-}
-
 static struct extent_io_ops btree_extent_io_ops = {
         .write_cache_pages_lock_hook = btree_lock_page_hook,
         .readpage_end_io_hook = btree_readpage_end_io_hook,
@@ -3689,5 +3678,4 @@ static struct extent_io_ops btree_extent_io_ops = {
         .submit_bio_hook = btree_submit_bio_hook,
         /* note we're sharing with inode.c for the merge bio hook */
         .merge_bio_hook = btrfs_merge_bio_hook,
-        .writepage_io_failed_hook = btree_writepage_io_failed_hook,
 };