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

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

Btrfs: add new sources for device replace code 



This adds a new file to the sources together with the header file
and the changes to ioctl.h and ctree.h that are required by the
new C source file. Additionally, 4 new functions are added to
volume.c that deal with device creation and destruction.

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

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \

	   export.o tree-log.o free-space-cache.o zlib.o lzo.o \

	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \

	   reada.o backref.o ulist.o qgroup.o send.o

	   reada.o backref.o ulist.o qgroup.o send.o dev-replace.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

fs/btrfs/ctree.h

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ struct btrfs_ordered_sum; 


#define BTRFS_EMPTY_SUBVOL_DIR_OBJECTID 2



#define BTRFS_DEV_REPLACE_DEVID 0



/*

 * the max metadata block size.  This limit is somewhat artificial,

 * but the memmove costs go through the roof for larger blocks.

fs/btrfs/dev-replace.c

0 → 100644
+856 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/btrfs/dev-replace.h

+18 −0
Original line number Diff line number Diff line
@@ -19,6 +19,24 @@ 
#if !defined(__BTRFS_DEV_REPLACE__)

#define __BTRFS_DEV_REPLACE__



struct btrfs_ioctl_dev_replace_args;



int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info);

int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,

			  struct btrfs_fs_info *fs_info);

void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info);

int btrfs_dev_replace_start(struct btrfs_root *root,

			    struct btrfs_ioctl_dev_replace_args *args);

void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,

			      struct btrfs_ioctl_dev_replace_args *args);

int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info,

			     struct btrfs_ioctl_dev_replace_args *args);

void btrfs_dev_replace_suspend_for_unmount(struct btrfs_fs_info *fs_info);

int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info);

int btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace);

void btrfs_dev_replace_lock(struct btrfs_dev_replace *dev_replace);

void btrfs_dev_replace_unlock(struct btrfs_dev_replace *dev_replace);



static inline void btrfs_dev_replace_stats_inc(atomic64_t *stat_value)

{

	atomic64_inc(stat_value);

fs/btrfs/ioctl.h

+45 −0
Original line number Diff line number Diff line
@@ -123,6 +123,48 @@ struct btrfs_ioctl_scrub_args { 
	__u64 unused[(1024-32-sizeof(struct btrfs_scrub_progress))/8];

};



#define BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_ALWAYS	0

#define BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_AVOID	1

struct btrfs_ioctl_dev_replace_start_params {

	__u64 srcdevid;	/* in, if 0, use srcdev_name instead */

	__u8 srcdev_name[BTRFS_PATH_NAME_MAX + 1];	/* in */

	__u8 tgtdev_name[BTRFS_PATH_NAME_MAX + 1];	/* in */

	__u64 cont_reading_from_srcdev_mode;	/* in, see #define

						 * above */

};



#define BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED	0

#define BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED		1

#define BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED		2

#define BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED		3

#define BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED		4

struct btrfs_ioctl_dev_replace_status_params {

	__u64 replace_state;	/* out, see #define above */

	__u64 progress_1000;	/* out, 0 <= x <= 1000 */

	__u64 time_started;	/* out, seconds since 1-Jan-1970 */

	__u64 time_stopped;	/* out, seconds since 1-Jan-1970 */

	__u64 num_write_errors;	/* out */

	__u64 num_uncorrectable_read_errors;	/* out */

};



#define BTRFS_IOCTL_DEV_REPLACE_CMD_START			0

#define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS			1

#define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL			2

#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR			0

#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED		1

#define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED		2

struct btrfs_ioctl_dev_replace_args {

	__u64 cmd;	/* in */

	__u64 result;	/* out */



	union {

		struct btrfs_ioctl_dev_replace_start_params start;

		struct btrfs_ioctl_dev_replace_status_params status;

	};	/* in/out */



	__u64 spare[64];

};



#define BTRFS_DEVICE_PATH_NAME_MAX 1024

struct btrfs_ioctl_dev_info_args {

	__u64 devid;				/* in/out */
@@ -453,4 +495,7 @@ struct btrfs_ioctl_send_args { 
			       struct btrfs_ioctl_qgroup_limit_args)

#define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \

				      struct btrfs_ioctl_get_dev_stats)

#define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \

				    struct btrfs_ioctl_dev_replace_args)



#endif