Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dabb742 authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik
Browse files

Btrfs: change core code of btrfs to support the device replace operations 



This commit contains all the essential changes to the core code
of Btrfs for support of the device replace procedure.

Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent e93c89c1

fs/btrfs/disk-io.c

+23 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "inode-map.h"

#include "check-integrity.h"

#include "rcu-string.h"

#include "dev-replace.h"



#ifdef CONFIG_X86

#include <asm/cpufeature.h>
@@ -2438,7 +2439,11 @@ int open_ctree(struct super_block *sb, 
		goto fail_tree_roots;

	}



	btrfs_close_extra_devices(fs_devices);

	/*

	 * keep the device that is marked to be the target device for the

	 * dev_replace procedure

	 */

	btrfs_close_extra_devices(fs_info, fs_devices, 0);



	if (!fs_devices->latest_bdev) {

		printk(KERN_CRIT "btrfs: failed to read devices on %s\n",
@@ -2510,6 +2515,14 @@ int open_ctree(struct super_block *sb, 
		goto fail_block_groups;

	}



	ret = btrfs_init_dev_replace(fs_info);

	if (ret) {

		pr_err("btrfs: failed to init dev_replace: %d\n", ret);

		goto fail_block_groups;

	}



	btrfs_close_extra_devices(fs_info, fs_devices, 1);



	ret = btrfs_init_space_info(fs_info);

	if (ret) {

		printk(KERN_ERR "Failed to initial space info: %d\n", ret);
@@ -2658,6 +2671,13 @@ int open_ctree(struct super_block *sb, 
		return ret;

	}



	ret = btrfs_resume_dev_replace_async(fs_info);

	if (ret) {

		pr_warn("btrfs: failed to resume dev_replace\n");

		close_ctree(tree_root);

		return ret;

	}



	return 0;



fail_qgroup:
@@ -3300,6 +3320,8 @@ int close_ctree(struct btrfs_root *root) 
	/* pause restriper - we want to resume on mount */

	btrfs_pause_balance(fs_info);



	btrfs_dev_replace_suspend_for_unmount(fs_info);



	btrfs_scrub_cancel(fs_info);



	/* wait for any defraggers to finish */

fs/btrfs/reada.c

+17 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "volumes.h"

#include "disk-io.h"

#include "transaction.h"

#include "dev-replace.h"



#undef DEBUG
@@ -331,6 +332,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
	int nzones = 0;

	int i;

	unsigned long index = logical >> PAGE_CACHE_SHIFT;

	int dev_replace_is_ongoing;



	spin_lock(&fs_info->reada_lock);

	re = radix_tree_lookup(&fs_info->reada_tree, index);
@@ -392,6 +394,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
	}



	/* insert extent in reada_tree + all per-device trees, all or nothing */

	btrfs_dev_replace_lock(&fs_info->dev_replace);

	spin_lock(&fs_info->reada_lock);

	ret = radix_tree_insert(&fs_info->reada_tree, index, re);

	if (ret == -EEXIST) {
@@ -399,13 +402,17 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
		BUG_ON(!re_exist);

		re_exist->refcnt++;

		spin_unlock(&fs_info->reada_lock);

		btrfs_dev_replace_unlock(&fs_info->dev_replace);

		goto error;

	}

	if (ret) {

		spin_unlock(&fs_info->reada_lock);

		btrfs_dev_replace_unlock(&fs_info->dev_replace);

		goto error;

	}

	prev_dev = NULL;

	dev_replace_is_ongoing = btrfs_dev_replace_is_ongoing(

			&fs_info->dev_replace);

	for (i = 0; i < nzones; ++i) {

		dev = bbio->stripes[i].dev;

		if (dev == prev_dev) {
@@ -422,6 +429,14 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
			/* cannot read ahead on missing device */

			continue;

		}

		if (dev_replace_is_ongoing &&

		    dev == fs_info->dev_replace.tgtdev) {

			/*

			 * as this device is selected for reading only as

			 * a last resort, skip it for read ahead.

			 */

			continue;

		}

		prev_dev = dev;

		ret = radix_tree_insert(&dev->reada_extents, index, re);

		if (ret) {
@@ -434,10 +449,12 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
			BUG_ON(fs_info == NULL);

			radix_tree_delete(&fs_info->reada_tree, index);

			spin_unlock(&fs_info->reada_lock);

			btrfs_dev_replace_unlock(&fs_info->dev_replace);

			goto error;

		}

	}

	spin_unlock(&fs_info->reada_lock);

	btrfs_dev_replace_unlock(&fs_info->dev_replace);



	kfree(bbio);

	return re;

fs/btrfs/scrub.c

+6 −1
Original line number Diff line number Diff line
@@ -2843,12 +2843,17 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 
		return -EIO;

	}



	if (dev->scrub_device) {

	btrfs_dev_replace_lock(&fs_info->dev_replace);

	if (dev->scrub_device ||

	    (!is_dev_replace &&

	     btrfs_dev_replace_is_ongoing(&fs_info->dev_replace))) {

		btrfs_dev_replace_unlock(&fs_info->dev_replace);

		mutex_unlock(&fs_info->scrub_lock);

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		scrub_workers_put(fs_info);

		return -EINPROGRESS;

	}

	btrfs_dev_replace_unlock(&fs_info->dev_replace);

	sctx = scrub_setup_ctx(dev, is_dev_replace);

	if (IS_ERR(sctx)) {

		mutex_unlock(&fs_info->scrub_lock);

fs/btrfs/super.c

+13 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "export.h"

#include "compression.h"

#include "rcu-string.h"

#include "dev-replace.h"



#define CREATE_TRACE_POINTS

#include <trace/events/btrfs.h>
@@ -1225,8 +1226,15 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) 
		return 0;



	if (*flags & MS_RDONLY) {

		/*

		 * this also happens on 'umount -rf' or on shutdown, when

		 * the filesystem is busy.

		 */

		sb->s_flags |= MS_RDONLY;



		btrfs_dev_replace_suspend_for_unmount(fs_info);

		btrfs_scrub_cancel(fs_info);



		ret = btrfs_commit_super(root);

		if (ret)

			goto restore;
@@ -1263,6 +1271,11 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) 
		if (ret)

			goto restore;



		ret = btrfs_resume_dev_replace_async(fs_info);

		if (ret) {

			pr_warn("btrfs: failed to resume dev_replace\n");

			goto restore;

		}

		sb->s_flags &= ~MS_RDONLY;

	}

fs/btrfs/transaction.c

+6 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "tree-log.h"

#include "inode-map.h"

#include "volumes.h"

#include "dev-replace.h"



#define BTRFS_ROOT_TRANS_TAG 0
@@ -845,7 +846,9 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans, 
		return ret;



	ret = btrfs_run_dev_stats(trans, root->fs_info);

	BUG_ON(ret);

	WARN_ON(ret);

	ret = btrfs_run_dev_replace(trans, root->fs_info);

	WARN_ON(ret);



	ret = btrfs_run_qgroups(trans, root->fs_info);

	BUG_ON(ret);
@@ -868,6 +871,8 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans, 
	switch_commit_root(fs_info->extent_root);

	up_write(&fs_info->extent_commit_sem);



	btrfs_after_dev_replace_commit(fs_info);



	return 0;

}