2015-01-10 16:59:38

by Rickard Strandqvist

Subject: [PATCH] lockd: xdr: Remove unused function

Remove the function nlm_encode_fh() that is not used anywhere.

This was partially found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <[email protected]>
---
fs/lockd/xdr.c | 8 --------
1 file changed, 8 deletions(-)

diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 9340e7e..5b651da 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -95,14 +95,6 @@ nlm_decode_fh(__be32 *p, struct nfs_fh *f)
return p + XDR_QUADLEN(NFS2_FHSIZE);
}

-static inline __be32 *
-nlm_encode_fh(__be32 *p, struct nfs_fh *f)
-{
- *p++ = htonl(NFS2_FHSIZE);
- memcpy(p, f->data, NFS2_FHSIZE);
- return p + XDR_QUADLEN(NFS2_FHSIZE);
-}
-
/*
* Encode and decode owner handle
*/
--
1.7.10.4

2015-01-12 21:24:55

by J. Bruce Fields

Subject: Re: [PATCH] lockd: xdr: Remove unused function

On Sat, Jan 10, 2015 at 06:02:42PM +0100, Rickard Strandqvist wrote:
> Remove the function nlm_encode_fh() that is not used anywhere.
>
> This was partially found by using a static code analysis program called cppcheck.

Huh. OK, thanks--applying.

--b.

>
> Signed-off-by: Rickard Strandqvist <[email protected]>
> ---
> fs/lockd/xdr.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
> index 9340e7e..5b651da 100644
> --- a/fs/lockd/xdr.c
> +++ b/fs/lockd/xdr.c
> @@ -95,14 +95,6 @@ nlm_decode_fh(__be32 *p, struct nfs_fh *f)
> return p + XDR_QUADLEN(NFS2_FHSIZE);
> }
>
> -static inline __be32 *
> -nlm_encode_fh(__be32 *p, struct nfs_fh *f)
> -{
> - *p++ = htonl(NFS2_FHSIZE);
> - memcpy(p, f->data, NFS2_FHSIZE);
> - return p + XDR_QUADLEN(NFS2_FHSIZE);
> -}
> -
> /*
> * Encode and decode owner handle
> */
> --
> 1.7.10.4
>