[PATCH] locked: remove nlmsvc_decode_norep/grantedres

[PATCH] locked: remove nlmsvc_decode_norep/grantedres

[Alex Shi]

These 2 macros are never used after first git commit Linux-2.6.12-rc2.
So guess better to remove them.

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org> 
Cc: Chuck Lever <chuck.lever@oracle.com> 
Cc: Trond Myklebust <trond.myklebust@hammerspace.com> 
Cc: Anna Schumaker <anna.schumaker@netapp.com> 
Cc: linux-nfs@vger.kernel.org 
Cc: linux-kernel@vger.kernel.org 
---
 fs/lockd/svcproc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index d0bb7a6bf005..8b7565c71863 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -534,12 +534,10 @@ static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp)
  */
 
 #define nlmsvc_encode_norep	nlmsvc_encode_void
-#define nlmsvc_decode_norep	nlmsvc_decode_void
 #define nlmsvc_decode_testres	nlmsvc_decode_void
 #define nlmsvc_decode_lockres	nlmsvc_decode_void
 #define nlmsvc_decode_unlockres	nlmsvc_decode_void
 #define nlmsvc_decode_cancelres	nlmsvc_decode_void
-#define nlmsvc_decode_grantedres	nlmsvc_decode_void
 
 #define nlmsvc_proc_none	nlmsvc_proc_null
 #define nlmsvc_proc_test_res	nlmsvc_proc_null
-- 
1.8.3.1

Re: [PATCH] locked: remove nlmsvc_decode_norep/grantedres

[J. Bruce Fields]

On Tue, Jan 21, 2020 at 04:34:42PM +0800, Alex Shi wrote:
> These 2 macros are never used after first git commit Linux-2.6.12-rc2.
> So guess better to remove them.

I'm not fond of these macros.  If we're going to doing anything to them,
I'd rather just get rid of the entirely (including the PROC macro) and
write out the initialization of nlmsvc_procedures.  Yes, it'd probably
add another 80 or so lines to the file, but it'd be readable without
referring to the macro definitions.  And it would be less confusing to
people who grep for the users of the various proc/encode/decode methods
and can't find them.

--b.

> 
> Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
> Cc: "J. Bruce Fields" <bfields@fieldses.org> 
> Cc: Chuck Lever <chuck.lever@oracle.com> 
> Cc: Trond Myklebust <trond.myklebust@hammerspace.com> 
> Cc: Anna Schumaker <anna.schumaker@netapp.com> 
> Cc: linux-nfs@vger.kernel.org 
> Cc: linux-kernel@vger.kernel.org 
> ---
>  fs/lockd/svcproc.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
> index d0bb7a6bf005..8b7565c71863 100644
> --- a/fs/lockd/svcproc.c
> +++ b/fs/lockd/svcproc.c
> @@ -534,12 +534,10 @@ static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp)
>   */
>  
>  #define nlmsvc_encode_norep	nlmsvc_encode_void
> -#define nlmsvc_decode_norep	nlmsvc_decode_void
>  #define nlmsvc_decode_testres	nlmsvc_decode_void
>  #define nlmsvc_decode_lockres	nlmsvc_decode_void
>  #define nlmsvc_decode_unlockres	nlmsvc_decode_void
>  #define nlmsvc_decode_cancelres	nlmsvc_decode_void
> -#define nlmsvc_decode_grantedres	nlmsvc_decode_void
>  
>  #define nlmsvc_proc_none	nlmsvc_proc_null
>  #define nlmsvc_proc_test_res	nlmsvc_proc_null
> -- 
> 1.8.3.1