2018-04-24 13:15:56

by Luc Van Oostenryck

Subject: [PATCH] drdb: fix print_st_err()'s prototype

print_st_err() is defined with its 4th argument taking an
'enum drbd_state_rv' but its prototype use an int for it.

Fix this by using 'enum drbd_state_rv' in the prototype too.

Signed-off-by: Luc Van Oostenryck <[email protected]>
---
drivers/block/drbd/drbd_state.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/drbd/drbd_state.h b/drivers/block/drbd/drbd_state.h
index ea58301d0..b2a390ba7 100644
--- a/drivers/block/drbd/drbd_state.h
+++ b/drivers/block/drbd/drbd_state.h
@@ -131,7 +131,7 @@ extern enum drbd_state_rv _drbd_set_state(struct drbd_device *, union drbd_state
enum chg_state_flags,
struct completion *done);
extern void print_st_err(struct drbd_device *, union drbd_state,
- union drbd_state, int);
+ union drbd_state, enum drbd_state_rv);

enum drbd_state_rv
_conn_request_state(struct drbd_connection *connection, union drbd_state mask, union drbd_state val,
--
2.17.0

2018-04-25 10:55:59

by Roland Kammerer

Subject: Re: [Drbd-dev] [PATCH] drdb: fix print_st_err()'s prototype

On Tue, Apr 24, 2018 at 03:14:10PM +0200, Luc Van Oostenryck wrote:
> print_st_err() is defined with its 4th argument taking an
> 'enum drbd_state_rv' but its prototype use an int for it.
>
> Fix this by using 'enum drbd_state_rv' in the prototype too.
>
> Signed-off-by: Luc Van Oostenryck <[email protected]>
> ---
> drivers/block/drbd/drbd_state.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/drbd/drbd_state.h b/drivers/block/drbd/drbd_state.h
> index ea58301d0..b2a390ba7 100644
> --- a/drivers/block/drbd/drbd_state.h
> +++ b/drivers/block/drbd/drbd_state.h
> @@ -131,7 +131,7 @@ extern enum drbd_state_rv _drbd_set_state(struct drbd_device *, union drbd_state
> enum chg_state_flags,
> struct completion *done);
> extern void print_st_err(struct drbd_device *, union drbd_state,
> - union drbd_state, int);
> + union drbd_state, enum drbd_state_rv);
>
> enum drbd_state_rv
> _conn_request_state(struct drbd_connection *connection, union drbd_state mask, union drbd_state val,
> --
> 2.17.0

Thanks, looks good.

Applied to our internal tree. As usual, we send it mainline bundled with
other pending changes.

Regards, rck