2018-03-19 22:37:09

by Stefan Agner

Subject: [PATCH] nfsd: use correct enum type in decode_cb_op_status

Use enum nfs_cb_opnum4 in decode_cb_op_status. This fixes warnings
seen with clang:
fs/nfsd/nfs4callback.c:451:36: warning: implicit conversion from
enumeration type 'enum nfs_cb_opnum4' to different enumeration
type 'enum nfs_opnum4' [-Wenum-conversion]
status = decode_cb_op_status(xdr, OP_CB_SEQUENCE, &cb->cb_seq_status);
~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~

Signed-off-by: Stefan Agner <[email protected]>
---
fs/nfsd/nfs4callback.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 49b0a9e7ff18..1f04d2a70d25 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -223,8 +223,8 @@ static int nfs_cb_stat_to_errno(int status)
return -status;
}

-static int decode_cb_op_status(struct xdr_stream *xdr, enum nfs_opnum4 expected,
- int *status)
+static int decode_cb_op_status(struct xdr_stream *xdr,
+ enum nfs_cb_opnum4 expected, int *status)
{
__be32 *p;
u32 op;
--
2.16.2

2018-03-22 20:18:15

by J. Bruce Fields

Subject: Re: [PATCH] nfsd: use correct enum type in decode_cb_op_status

Applying, thanks!--b.

On Mon, Mar 19, 2018 at 11:37:05PM +0100, Stefan Agner wrote:
> Use enum nfs_cb_opnum4 in decode_cb_op_status. This fixes warnings
> seen with clang:
> fs/nfsd/nfs4callback.c:451:36: warning: implicit conversion from
> enumeration type 'enum nfs_cb_opnum4' to different enumeration
> type 'enum nfs_opnum4' [-Wenum-conversion]
> status = decode_cb_op_status(xdr, OP_CB_SEQUENCE, &cb->cb_seq_status);
> ~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~
>
> Signed-off-by: Stefan Agner <[email protected]>
> ---
> fs/nfsd/nfs4callback.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index 49b0a9e7ff18..1f04d2a70d25 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -223,8 +223,8 @@ static int nfs_cb_stat_to_errno(int status)
> return -status;
> }
>
> -static int decode_cb_op_status(struct xdr_stream *xdr, enum nfs_opnum4 expected,
> - int *status)
> +static int decode_cb_op_status(struct xdr_stream *xdr,
> + enum nfs_cb_opnum4 expected, int *status)
> {
> __be32 *p;
> u32 op;
> --
> 2.16.2