Commit 27e022a9 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: replace: BTRFS_DEV_REPLACE_ITEM_STATE_x defines should go 



The BTRFS_DEV_REPLACE_ITEM_STATE_x defines, as shown in [1], are
unused in both kernel and btrfs-progs (except for one instance of
BTRFS_DEV_REPLACE_ITEM_STATE_NEVER_STARTED in kernel).

[1]
btrfs.h:#define BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED        2
btrfs.h:#define BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED        3
btrfs.h:#define BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED       4

Further these define-values are different form its counterpart
BTRFS_IOCTL_DEV_REPLACE_STATE_x series as shown in [2].

[2]
btrfs_tree.h:#define BTRFS_DEV_REPLACE_ITEM_STATE_SUSPENDED   2
btrfs_tree.h:#define BTRFS_DEV_REPLACE_ITEM_STATE_FINISHED    3
btrfs_tree.h:#define BTRFS_DEV_REPLACE_ITEM_STATE_CANCELED    4

So this patch deletes the BTRFS_DEV_REPLACE_ITEM_STATE_x altogether, and
one instance of BTRFS_DEV_REPLACE_ITEM_STATE_NEVER_STARTED is replaced
with BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED in the kernel.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d3984c90

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) 
no_valid_dev_replace_entry_found:

		ret = 0;

		dev_replace->replace_state =

			BTRFS_DEV_REPLACE_ITEM_STATE_NEVER_STARTED;

			BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED;

		dev_replace->cont_reading_from_srcdev_mode =

		    BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_ALWAYS;

		dev_replace->time_started = 0;

include/uapi/linux/btrfs_tree.h

+0 −5
Original line number Diff line number Diff line
@@ -806,11 +806,6 @@ struct btrfs_dev_stats_item { 


#define BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_ALWAYS	0

#define BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_AVOID	1

#define BTRFS_DEV_REPLACE_ITEM_STATE_NEVER_STARTED	0

#define BTRFS_DEV_REPLACE_ITEM_STATE_STARTED		1

#define BTRFS_DEV_REPLACE_ITEM_STATE_SUSPENDED		2

#define BTRFS_DEV_REPLACE_ITEM_STATE_FINISHED		3

#define BTRFS_DEV_REPLACE_ITEM_STATE_CANCELED		4



struct btrfs_dev_replace_item {

	/*