* [PATCH 0/3] cleanup btrfs_dev_replace_cancel()
@ 2018-02-12 15:33 Anand Jain
2018-02-12 15:33 ` [PATCH 1/3] btrfs: open code btrfs_dev_replace_cancel() Anand Jain
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Anand Jain @ 2018-02-12 15:33 UTC (permalink / raw)
To: linux-btrfs
Anand Jain (3):
btrfs: open code btrfs_dev_replace_cancel()
btrfs: rename __btrfs_dev_replace_cancel()
btrfs: change the return arg type for btrfs_dev_replace_cancel()
fs/btrfs/dev-replace.c | 12 ++----------
fs/btrfs/dev-replace.h | 3 +--
fs/btrfs/ioctl.c | 3 ++-
3 files changed, 5 insertions(+), 13 deletions(-)
--
2.7.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] btrfs: open code btrfs_dev_replace_cancel()
2018-02-12 15:33 [PATCH 0/3] cleanup btrfs_dev_replace_cancel() Anand Jain
@ 2018-02-12 15:33 ` Anand Jain
2018-02-12 15:33 ` [PATCH 2/3] btrfs: rename __btrfs_dev_replace_cancel() Anand Jain
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Anand Jain @ 2018-02-12 15:33 UTC (permalink / raw)
To: linux-btrfs
btrfs_dev_replace_cancel() calls __btrfs_dev_replace_cancel() for the
actual cancel so just code it.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 10 +---------
fs/btrfs/dev-replace.h | 3 +--
fs/btrfs/ioctl.c | 3 ++-
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 7efbc4d1128b..1ce9528663a6 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -44,7 +44,6 @@ static void btrfs_dev_replace_update_device_in_mapping_tree(
struct btrfs_fs_info *fs_info,
struct btrfs_device *srcdev,
struct btrfs_device *tgtdev);
-static u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);
static int btrfs_dev_replace_kthread(void *data);
static int btrfs_dev_replace_continue_on_mount(struct btrfs_fs_info *fs_info);
@@ -694,14 +693,7 @@ void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,
btrfs_dev_replace_unlock(dev_replace, 0);
}
-int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info,
- struct btrfs_ioctl_dev_replace_args *args)
-{
- args->result = __btrfs_dev_replace_cancel(fs_info);
- return 0;
-}
-
-static u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
+u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
{
struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
struct btrfs_device *tgt_device = NULL;
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h
index f94a76844ae7..d8b314ff12c1 100644
--- a/fs/btrfs/dev-replace.h
+++ b/fs/btrfs/dev-replace.h
@@ -32,8 +32,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
int read_src);
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);
+u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);
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);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index f573cad72b7e..a2b7740230d9 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4428,7 +4428,8 @@ static long btrfs_ioctl_dev_replace(struct btrfs_fs_info *fs_info,
ret = 0;
break;
case BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL:
- ret = btrfs_dev_replace_cancel(fs_info, p);
+ p->result = __btrfs_dev_replace_cancel(fs_info);
+ ret = 0;
break;
default:
ret = -EINVAL;
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] btrfs: rename __btrfs_dev_replace_cancel()
2018-02-12 15:33 [PATCH 0/3] cleanup btrfs_dev_replace_cancel() Anand Jain
2018-02-12 15:33 ` [PATCH 1/3] btrfs: open code btrfs_dev_replace_cancel() Anand Jain
@ 2018-02-12 15:33 ` Anand Jain
2018-02-12 15:33 ` [PATCH 3/3] btrfs: btrfs_dev_replace_cancel() can return int Anand Jain
2018-02-12 16:58 ` [PATCH 0/3] cleanup btrfs_dev_replace_cancel() David Sterba
3 siblings, 0 replies; 5+ messages in thread
From: Anand Jain @ 2018-02-12 15:33 UTC (permalink / raw)
To: linux-btrfs
Remove __ which is for the special functions.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 2 +-
fs/btrfs/dev-replace.h | 2 +-
fs/btrfs/ioctl.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 1ce9528663a6..4d1dbc16fcd4 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -693,7 +693,7 @@ void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,
btrfs_dev_replace_unlock(dev_replace, 0);
}
-u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
+u64 btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
{
struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
struct btrfs_device *tgt_device = NULL;
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h
index d8b314ff12c1..6c3543d93e96 100644
--- a/fs/btrfs/dev-replace.h
+++ b/fs/btrfs/dev-replace.h
@@ -32,7 +32,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
int read_src);
void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,
struct btrfs_ioctl_dev_replace_args *args);
-u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);
+u64 btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);
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);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a2b7740230d9..9ff7b230eff3 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4428,7 +4428,7 @@ static long btrfs_ioctl_dev_replace(struct btrfs_fs_info *fs_info,
ret = 0;
break;
case BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL:
- p->result = __btrfs_dev_replace_cancel(fs_info);
+ p->result = btrfs_dev_replace_cancel(fs_info);
ret = 0;
break;
default:
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] btrfs: btrfs_dev_replace_cancel() can return int
2018-02-12 15:33 [PATCH 0/3] cleanup btrfs_dev_replace_cancel() Anand Jain
2018-02-12 15:33 ` [PATCH 1/3] btrfs: open code btrfs_dev_replace_cancel() Anand Jain
2018-02-12 15:33 ` [PATCH 2/3] btrfs: rename __btrfs_dev_replace_cancel() Anand Jain
@ 2018-02-12 15:33 ` Anand Jain
2018-02-12 16:58 ` [PATCH 0/3] cleanup btrfs_dev_replace_cancel() David Sterba
3 siblings, 0 replies; 5+ messages in thread
From: Anand Jain @ 2018-02-12 15:33 UTC (permalink / raw)
To: linux-btrfs
Current u64 return from btrfs_dev_replace_cancel() was probably done
to match the btrfs_ioctl_dev_replace_args::result. However as our
actual return value fits in int, and it further gets typecast to u64,
so just return int.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 4 ++--
fs/btrfs/dev-replace.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 4d1dbc16fcd4..a428d528220f 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -693,13 +693,13 @@ void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,
btrfs_dev_replace_unlock(dev_replace, 0);
}
-u64 btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
+int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
{
struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
struct btrfs_device *tgt_device = NULL;
struct btrfs_trans_handle *trans;
struct btrfs_root *root = fs_info->tree_root;
- u64 result;
+ int result;
int ret;
if (sb_rdonly(fs_info->sb))
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h
index 6c3543d93e96..389de365b0db 100644
--- a/fs/btrfs/dev-replace.h
+++ b/fs/btrfs/dev-replace.h
@@ -32,7 +32,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
int read_src);
void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,
struct btrfs_ioctl_dev_replace_args *args);
-u64 btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);
+int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);
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);
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] cleanup btrfs_dev_replace_cancel()
2018-02-12 15:33 [PATCH 0/3] cleanup btrfs_dev_replace_cancel() Anand Jain
` (2 preceding siblings ...)
2018-02-12 15:33 ` [PATCH 3/3] btrfs: btrfs_dev_replace_cancel() can return int Anand Jain
@ 2018-02-12 16:58 ` David Sterba
3 siblings, 0 replies; 5+ messages in thread
From: David Sterba @ 2018-02-12 16:58 UTC (permalink / raw)
To: Anand Jain; +Cc: linux-btrfs
On Mon, Feb 12, 2018 at 11:33:28PM +0800, Anand Jain wrote:
> Anand Jain (3):
> btrfs: open code btrfs_dev_replace_cancel()
> btrfs: rename __btrfs_dev_replace_cancel()
> btrfs: change the return arg type for btrfs_dev_replace_cancel()
1-3 look good,
Reviewed-by: David Sterba <dsterba@suse.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-12 17:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-12 15:33 [PATCH 0/3] cleanup btrfs_dev_replace_cancel() Anand Jain
2018-02-12 15:33 ` [PATCH 1/3] btrfs: open code btrfs_dev_replace_cancel() Anand Jain
2018-02-12 15:33 ` [PATCH 2/3] btrfs: rename __btrfs_dev_replace_cancel() Anand Jain
2018-02-12 15:33 ` [PATCH 3/3] btrfs: btrfs_dev_replace_cancel() can return int Anand Jain
2018-02-12 16:58 ` [PATCH 0/3] cleanup btrfs_dev_replace_cancel() David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).