lockd: Remove dead code from fs/lockd/xdr4.c

Now that all NLMv4 server-side procedures use XDR encoder and
decoder functions generated by xdrgen, the hand-written code in
fs/lockd/xdr4.c is no longer needed. This file contained the
original XDR processing logic that has been systematically
replaced throughout this series.

Remove the file and its Makefile reference to eliminate the
dead code. The helper function nlm4svc_set_file_lock_range()
is still needed by the generated code, so move it to xdr4.h
as an inline function where it remains accessible.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/Makefile b/fs/lockd/Makefile
index 8e9d18a4348cbaeb38f65a822da8a2328aae6579..808f0f2a7be13a7a66719bb2a2a77df1726f327a 100644 (file)
--- a/fs/lockd/Makefile
+++ b/fs/lockd/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_LOCKD) += lockd.o
 
 lockd-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
           svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o netlink.o
-lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o nlm4xdr_gen.o
+lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o svc4proc.o nlm4xdr_gen.o
 lockd-$(CONFIG_PROC_FS) += procfs.o
 
 #

diff --git a/fs/lockd/clnt4xdr.c b/fs/lockd/clnt4xdr.c
index c09e67765cac412fa751560faf670e4b7fb1bd47..2058733eacf838d15483d45a7c961038ba0c434c 100644 (file)
--- a/fs/lockd/clnt4xdr.c
+++ b/fs/lockd/clnt4xdr.c
@@ -18,8 +18,6 @@
 
 #include <uapi/linux/nfs3.h>
 
-#include "xdr4.h"
-
 #define NLMDBG_FACILITY                NLMDBG_XDR
 
 #if (NLMCLNT_OHSIZE > XDR_MAX_NETOBJ)

diff --git a/fs/lockd/lockd.h b/fs/lockd/lockd.h
index ad4c6701b64a7ddd9b1c47e6bd88c447f04176ab..a7c85ab6d4b5ed8cf1bcf9556a7841f4e269c229 100644 (file)
--- a/fs/lockd/lockd.h
+++ b/fs/lockd/lockd.h
@@ -52,6 +52,13 @@
  */
 #define LOCKD_DFLT_TIMEO       10
 
+/* error codes new to NLMv4 */
+#define        nlm4_deadlock           cpu_to_be32(NLM_DEADLCK)
+#define        nlm4_rofs               cpu_to_be32(NLM_ROFS)
+#define        nlm4_stale_fh           cpu_to_be32(NLM_STALE_FH)
+#define        nlm4_fbig               cpu_to_be32(NLM_FBIG)
+#define        nlm4_failed             cpu_to_be32(NLM_FAILED)
+
 /*
  * Internal-use status codes, not to be placed on the wire.
  * Version handlers translate these to appropriate wire values.

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 4044459b7c493be32bc9440572f39a0bc7a6cfc4..5de41e2495341ac8370228771c449c8e623a2a03 100644 (file)
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -24,7 +24,6 @@
 
 #include "share.h"
 #include "nlm4xdr_gen.h"
-#include "xdr4.h"
 
 /*
  * Wrapper structures combine xdrgen types with legacy nlm_lock.

diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
deleted file mode 100644 (file)
index 308aac9..0000000
--- a/fs/lockd/xdr4.c
+++ /dev/null
@@ -1,334 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * linux/fs/lockd/xdr4.c
- *
- * XDR support for lockd and the lock client.
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
- * Copyright (C) 1999, Trond Myklebust <trond.myklebust@fys.uio.no>
- */
-
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/nfs.h>
-
-#include <linux/sunrpc/xdr.h>
-#include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/stats.h>
-
-#include "lockd.h"
-#include "svcxdr.h"
-#include "xdr4.h"
-
-static inline s64
-loff_t_to_s64(loff_t offset)
-{
-       s64 res;
-       if (offset > NLM4_OFFSET_MAX)
-               res = NLM4_OFFSET_MAX;
-       else if (offset < -NLM4_OFFSET_MAX)
-               res = -NLM4_OFFSET_MAX;
-       else
-               res = offset;
-       return res;
-}
-
-/*
- * NLM file handles are defined by specification to be a variable-length
- * XDR opaque no longer than 1024 bytes. However, this implementation
- * limits their length to the size of an NFSv3 file handle.
- */
-static bool
-svcxdr_decode_fhandle(struct xdr_stream *xdr, struct nfs_fh *fh)
-{
-       __be32 *p;
-       u32 len;
-
-       if (xdr_stream_decode_u32(xdr, &len) < 0)
-               return false;
-       if (len > NFS_MAXFHSIZE)
-               return false;
-
-       p = xdr_inline_decode(xdr, len);
-       if (!p)
-               return false;
-       fh->size = len;
-       memcpy(fh->data, p, len);
-       memset(fh->data + len, 0, sizeof(fh->data) - len);
-
-       return true;
-}
-
-static bool
-svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)
-{
-       struct file_lock *fl = &lock->fl;
-
-       if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len))
-               return false;
-       if (!svcxdr_decode_fhandle(xdr, &lock->fh))
-               return false;
-       if (!svcxdr_decode_owner(xdr, &lock->oh))
-               return false;
-       if (xdr_stream_decode_u32(xdr, &lock->svid) < 0)
-               return false;
-       if (xdr_stream_decode_u64(xdr, &lock->lock_start) < 0)
-               return false;
-       if (xdr_stream_decode_u64(xdr, &lock->lock_len) < 0)
-               return false;
-
-       locks_init_lock(fl);
-       fl->c.flc_type  = F_RDLCK;
-       lockd_set_file_lock_range4(fl, lock->lock_start, lock->lock_len);
-       return true;
-}
-
-static bool
-svcxdr_encode_holder(struct xdr_stream *xdr, const struct nlm_lock *lock)
-{
-       const struct file_lock *fl = &lock->fl;
-       s64 start, len;
-
-       /* exclusive */
-       if (xdr_stream_encode_bool(xdr, fl->c.flc_type != F_RDLCK) < 0)
-               return false;
-       if (xdr_stream_encode_u32(xdr, lock->svid) < 0)
-               return false;
-       if (!svcxdr_encode_owner(xdr, &lock->oh))
-               return false;
-       start = loff_t_to_s64(fl->fl_start);
-       if (fl->fl_end == OFFSET_MAX)
-               len = 0;
-       else
-               len = loff_t_to_s64(fl->fl_end - fl->fl_start + 1);
-       if (xdr_stream_encode_u64(xdr, start) < 0)
-               return false;
-       if (xdr_stream_encode_u64(xdr, len) < 0)
-               return false;
-
-       return true;
-}
-
-static bool
-svcxdr_encode_testrply(struct xdr_stream *xdr, const struct nlm_res *resp)
-{
-       if (!svcxdr_encode_stats(xdr, resp->status))
-               return false;
-       switch (resp->status) {
-       case nlm_lck_denied:
-               if (!svcxdr_encode_holder(xdr, &resp->lock))
-                       return false;
-       }
-
-       return true;
-}
-
-
-/*
- * Decode Call arguments
- */
-
-bool
-nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       return true;
-}
-
-bool
-nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       u32 exclusive;
-
-       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
-               return false;
-       if (xdr_stream_decode_bool(xdr, &exclusive) < 0)
-               return false;
-       if (!svcxdr_decode_lock(xdr, &argp->lock))
-               return false;
-       if (exclusive)
-               argp->lock.fl.c.flc_type = F_WRLCK;
-
-       return true;
-}
-
-bool
-nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       u32 exclusive;
-
-       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
-               return false;
-       if (xdr_stream_decode_bool(xdr, &argp->block) < 0)
-               return false;
-       if (xdr_stream_decode_bool(xdr, &exclusive) < 0)
-               return false;
-       if (!svcxdr_decode_lock(xdr, &argp->lock))
-               return false;
-       if (exclusive)
-               argp->lock.fl.c.flc_type = F_WRLCK;
-       if (xdr_stream_decode_bool(xdr, &argp->reclaim) < 0)
-               return false;
-       if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
-               return false;
-       argp->monitor = 1;              /* monitor client by default */
-
-       return true;
-}
-
-bool
-nlm4svc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       u32 exclusive;
-
-       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
-               return false;
-       if (xdr_stream_decode_bool(xdr, &argp->block) < 0)
-               return false;
-       if (xdr_stream_decode_bool(xdr, &exclusive) < 0)
-               return false;
-       if (!svcxdr_decode_lock(xdr, &argp->lock))
-               return false;
-       if (exclusive)
-               argp->lock.fl.c.flc_type = F_WRLCK;
-
-       return true;
-}
-
-bool
-nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-
-       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
-               return false;
-       if (!svcxdr_decode_lock(xdr, &argp->lock))
-               return false;
-       argp->lock.fl.c.flc_type = F_UNLCK;
-
-       return true;
-}
-
-bool
-nlm4svc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_res *resp = rqstp->rq_argp;
-
-       if (!svcxdr_decode_cookie(xdr, &resp->cookie))
-               return false;
-       if (!svcxdr_decode_stats(xdr, &resp->status))
-               return false;
-
-       return true;
-}
-
-bool
-nlm4svc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_reboot *argp = rqstp->rq_argp;
-       __be32 *p;
-       u32 len;
-
-       if (xdr_stream_decode_u32(xdr, &len) < 0)
-               return false;
-       if (len > SM_MAXSTRLEN)
-               return false;
-       p = xdr_inline_decode(xdr, len);
-       if (!p)
-               return false;
-       argp->len = len;
-       argp->mon = (char *)p;
-       if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
-               return false;
-       p = xdr_inline_decode(xdr, SM_PRIV_SIZE);
-       if (!p)
-               return false;
-       memcpy(&argp->priv.data, p, sizeof(argp->priv.data));
-
-       return true;
-}
-
-bool
-nlm4svc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       struct nlm_lock *lock = &argp->lock;
-
-       if (!svcxdr_decode_cookie(xdr, &argp->cookie))
-               return false;
-       if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len))
-               return false;
-       if (!svcxdr_decode_fhandle(xdr, &lock->fh))
-               return false;
-       if (!svcxdr_decode_owner(xdr, &lock->oh))
-               return false;
-       /* XXX: Range checks are missing in the original code */
-       if (xdr_stream_decode_u32(xdr, &argp->fsm_mode) < 0)
-               return false;
-       if (xdr_stream_decode_u32(xdr, &argp->fsm_access) < 0)
-               return false;
-
-       return true;
-}
-
-bool
-nlm4svc_decode_notify(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       struct nlm_lock *lock = &argp->lock;
-
-       if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len))
-               return false;
-       if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
-               return false;
-
-       return true;
-}
-
-
-/*
- * Encode Reply results
- */
-
-bool
-nlm4svc_encode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       return true;
-}
-
-bool
-nlm4svc_encode_testres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_res *resp = rqstp->rq_resp;
-
-       return svcxdr_encode_cookie(xdr, &resp->cookie) &&
-               svcxdr_encode_testrply(xdr, resp);
-}
-
-bool
-nlm4svc_encode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_res *resp = rqstp->rq_resp;
-
-       return svcxdr_encode_cookie(xdr, &resp->cookie) &&
-               svcxdr_encode_stats(xdr, resp->status);
-}
-
-bool
-nlm4svc_encode_shareres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
-{
-       struct nlm_res *resp = rqstp->rq_resp;
-
-       if (!svcxdr_encode_cookie(xdr, &resp->cookie))
-               return false;
-       if (!svcxdr_encode_stats(xdr, resp->status))
-               return false;
-       /* sequence */
-       if (xdr_stream_encode_u32(xdr, 0) < 0)
-               return false;
-
-       return true;
-}

diff --git a/fs/lockd/xdr4.h b/fs/lockd/xdr4.h
deleted file mode 100644 (file)
index 4ddf51a..0000000
--- a/fs/lockd/xdr4.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * XDR types for the NLM protocol
- *
- * Copyright (C) 1996 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef _LOCKD_XDR4_H
-#define _LOCKD_XDR4_H
-
-/* error codes new to NLMv4 */
-#define        nlm4_deadlock           cpu_to_be32(NLM_DEADLCK)
-#define        nlm4_rofs               cpu_to_be32(NLM_ROFS)
-#define        nlm4_stale_fh           cpu_to_be32(NLM_STALE_FH)
-#define        nlm4_fbig               cpu_to_be32(NLM_FBIG)
-#define        nlm4_failed             cpu_to_be32(NLM_FAILED)
-
-bool   nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_decode_notify(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-
-bool   nlm4svc_encode_testres(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_encode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_encode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-bool   nlm4svc_encode_shareres(struct svc_rqst *rqstp, struct xdr_stream *xdr);
-
-#endif /* _LOCKD_XDR4_H */