mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 01:32:21 +02:00
lockd: Remove dead code from fs/lockd/xdr.c
All NLMv3 server-side procedures now dispatch through xdrgen-generated encoder and decoder functions, leaving the hand-written XDR processing in fs/lockd/xdr.c with no remaining callers. Remove fs/lockd/xdr.c, the fs/lockd/svcxdr.h header it included, the Makefile entry, and the now-unused nlmsvc_decode_* / nlmsvc_encode_* prototypes from fs/lockd/xdr.h. The structure definitions and status code macros in xdr.h are retained as they are still used by the client-side code. Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever
Chuck Lever
parent
5c0d3a859b
commit
9bf81d102c
|
|
@ -8,7 +8,7 @@ ccflags-y += -I$(src) # needed for trace events
|
|||
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 \
|
||||
svcshare.o svcproc.o svcsubs.o mon.o trace.o netlink.o \
|
||||
nlm3xdr_gen.o
|
||||
lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o svc4proc.o nlm4xdr_gen.o
|
||||
lockd-$(CONFIG_PROC_FS) += procfs.o
|
||||
|
|
|
|||
|
|
@ -1,142 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Encode/decode NLM basic data types
|
||||
*
|
||||
* Basic NLMv3 XDR data types are not defined in an IETF standards
|
||||
* document. X/Open has a description of these data types that
|
||||
* is useful. See Chapter 10 of "Protocols for Interworking:
|
||||
* XNFS, Version 3W".
|
||||
*
|
||||
* Basic NLMv4 XDR data types are defined in Appendix II.1.4 of
|
||||
* RFC 1813: "NFS Version 3 Protocol Specification".
|
||||
*
|
||||
* Author: Chuck Lever <chuck.lever@oracle.com>
|
||||
*
|
||||
* Copyright (c) 2020, Oracle and/or its affiliates.
|
||||
*/
|
||||
|
||||
#ifndef _LOCKD_SVCXDR_H_
|
||||
#define _LOCKD_SVCXDR_H_
|
||||
|
||||
static inline bool
|
||||
svcxdr_decode_stats(struct xdr_stream *xdr, __be32 *status)
|
||||
{
|
||||
__be32 *p;
|
||||
|
||||
p = xdr_inline_decode(xdr, XDR_UNIT);
|
||||
if (!p)
|
||||
return false;
|
||||
*status = *p;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
svcxdr_encode_stats(struct xdr_stream *xdr, __be32 status)
|
||||
{
|
||||
__be32 *p;
|
||||
|
||||
p = xdr_reserve_space(xdr, XDR_UNIT);
|
||||
if (!p)
|
||||
return false;
|
||||
*p = status;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
svcxdr_decode_string(struct xdr_stream *xdr, char **data, unsigned int *data_len)
|
||||
{
|
||||
__be32 *p;
|
||||
u32 len;
|
||||
|
||||
if (xdr_stream_decode_u32(xdr, &len) < 0)
|
||||
return false;
|
||||
if (len > NLM_MAXSTRLEN)
|
||||
return false;
|
||||
p = xdr_inline_decode(xdr, len);
|
||||
if (!p)
|
||||
return false;
|
||||
*data_len = len;
|
||||
*data = (char *)p;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* NLM cookies are defined by specification to be a variable-length
|
||||
* XDR opaque no longer than 1024 bytes. However, this implementation
|
||||
* limits their length to 32 bytes, and treats zero-length cookies
|
||||
* specially.
|
||||
*/
|
||||
static inline bool
|
||||
svcxdr_decode_cookie(struct xdr_stream *xdr, struct lockd_cookie *cookie)
|
||||
{
|
||||
__be32 *p;
|
||||
u32 len;
|
||||
|
||||
if (xdr_stream_decode_u32(xdr, &len) < 0)
|
||||
return false;
|
||||
if (len > NLM_MAXCOOKIELEN)
|
||||
return false;
|
||||
if (!len)
|
||||
goto out_hpux;
|
||||
|
||||
p = xdr_inline_decode(xdr, len);
|
||||
if (!p)
|
||||
return false;
|
||||
cookie->len = len;
|
||||
memcpy(cookie->data, p, len);
|
||||
|
||||
return true;
|
||||
|
||||
/* apparently HPUX can return empty cookies */
|
||||
out_hpux:
|
||||
cookie->len = 4;
|
||||
memset(cookie->data, 0, 4);
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
svcxdr_encode_cookie(struct xdr_stream *xdr, const struct lockd_cookie *cookie)
|
||||
{
|
||||
__be32 *p;
|
||||
|
||||
if (xdr_stream_encode_u32(xdr, cookie->len) < 0)
|
||||
return false;
|
||||
p = xdr_reserve_space(xdr, cookie->len);
|
||||
if (!p)
|
||||
return false;
|
||||
memcpy(p, cookie->data, cookie->len);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
svcxdr_decode_owner(struct xdr_stream *xdr, struct xdr_netobj *obj)
|
||||
{
|
||||
__be32 *p;
|
||||
u32 len;
|
||||
|
||||
if (xdr_stream_decode_u32(xdr, &len) < 0)
|
||||
return false;
|
||||
if (len > XDR_MAX_NETOBJ)
|
||||
return false;
|
||||
p = xdr_inline_decode(xdr, len);
|
||||
if (!p)
|
||||
return false;
|
||||
obj->len = len;
|
||||
obj->data = (u8 *)p;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline bool
|
||||
svcxdr_encode_owner(struct xdr_stream *xdr, const struct xdr_netobj *obj)
|
||||
{
|
||||
if (obj->len > XDR_MAX_NETOBJ)
|
||||
return false;
|
||||
return xdr_stream_encode_opaque(xdr, obj->data, obj->len) > 0;
|
||||
}
|
||||
|
||||
#endif /* _LOCKD_SVCXDR_H_ */
|
||||
354
fs/lockd/xdr.c
354
fs/lockd/xdr.c
|
|
@ -1,354 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* linux/fs/lockd/xdr.c
|
||||
*
|
||||
* XDR support for lockd and the lock client.
|
||||
*
|
||||
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
|
||||
#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 <uapi/linux/nfs2.h>
|
||||
|
||||
#include "lockd.h"
|
||||
#include "share.h"
|
||||
#include "svcxdr.h"
|
||||
|
||||
static inline loff_t
|
||||
s32_to_loff_t(__s32 offset)
|
||||
{
|
||||
return (loff_t)offset;
|
||||
}
|
||||
|
||||
static inline __s32
|
||||
loff_t_to_s32(loff_t offset)
|
||||
{
|
||||
__s32 res;
|
||||
if (offset >= NLM_OFFSET_MAX)
|
||||
res = NLM_OFFSET_MAX;
|
||||
else if (offset <= -NLM_OFFSET_MAX)
|
||||
res = -NLM_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
|
||||
* constrains their length to exactly the length of an NFSv2 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 != NFS2_FHSIZE)
|
||||
return false;
|
||||
|
||||
p = xdr_inline_decode(xdr, len);
|
||||
if (!p)
|
||||
return false;
|
||||
fh->size = NFS2_FHSIZE;
|
||||
memcpy(fh->data, p, len);
|
||||
memset(fh->data + NFS2_FHSIZE, 0, sizeof(fh->data) - NFS2_FHSIZE);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
svcxdr_decode_lock(struct xdr_stream *xdr, struct lockd_lock *lock)
|
||||
{
|
||||
struct file_lock *fl = &lock->fl;
|
||||
s32 start, len, end;
|
||||
|
||||
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_u32(xdr, &start) < 0)
|
||||
return false;
|
||||
if (xdr_stream_decode_u32(xdr, &len) < 0)
|
||||
return false;
|
||||
|
||||
locks_init_lock(fl);
|
||||
fl->c.flc_flags = FL_POSIX;
|
||||
fl->c.flc_type = F_RDLCK;
|
||||
end = start + len - 1;
|
||||
fl->fl_start = s32_to_loff_t(start);
|
||||
if (len == 0 || end < 0)
|
||||
fl->fl_end = OFFSET_MAX;
|
||||
else
|
||||
fl->fl_end = s32_to_loff_t(end);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
svcxdr_encode_holder(struct xdr_stream *xdr, const struct lockd_lock *lock)
|
||||
{
|
||||
const struct file_lock *fl = &lock->fl;
|
||||
s32 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_s32(fl->fl_start);
|
||||
if (fl->fl_end == OFFSET_MAX)
|
||||
len = 0;
|
||||
else
|
||||
len = loff_t_to_s32(fl->fl_end - fl->fl_start + 1);
|
||||
if (xdr_stream_encode_u32(xdr, start) < 0)
|
||||
return false;
|
||||
if (xdr_stream_encode_u32(xdr, len) < 0)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
svcxdr_encode_testrply(struct xdr_stream *xdr, const struct lockd_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
|
||||
nlmsvc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
nlmsvc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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
|
||||
nlmsvc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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
|
||||
nlmsvc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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
|
||||
nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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
|
||||
nlmsvc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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
|
||||
nlmsvc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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
|
||||
nlmsvc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_args *argp = rqstp->rq_argp;
|
||||
struct lockd_lock *lock = &argp->lock;
|
||||
|
||||
memset(lock, 0, sizeof(*lock));
|
||||
locks_init_lock(&lock->fl);
|
||||
lock->svid = LOCKD_SHARE_SVID;
|
||||
|
||||
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
|
||||
nlmsvc_decode_notify(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_args *argp = rqstp->rq_argp;
|
||||
struct lockd_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
|
||||
nlmsvc_encode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
nlmsvc_encode_testres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_res *resp = rqstp->rq_resp;
|
||||
|
||||
return svcxdr_encode_cookie(xdr, &resp->cookie) &&
|
||||
svcxdr_encode_testrply(xdr, resp);
|
||||
}
|
||||
|
||||
bool
|
||||
nlmsvc_encode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_res *resp = rqstp->rq_resp;
|
||||
|
||||
return svcxdr_encode_cookie(xdr, &resp->cookie) &&
|
||||
svcxdr_encode_stats(xdr, resp->status);
|
||||
}
|
||||
|
||||
bool
|
||||
nlmsvc_encode_shareres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
|
||||
{
|
||||
struct lockd_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;
|
||||
}
|
||||
|
|
@ -20,8 +20,6 @@ struct nsm_private {
|
|||
unsigned char data[SM_PRIV_SIZE];
|
||||
};
|
||||
|
||||
struct svc_rqst;
|
||||
|
||||
#define NLM_MAXCOOKIELEN 32
|
||||
#define NLM_MAXSTRLEN 1024
|
||||
|
||||
|
|
@ -63,9 +61,6 @@ struct lockd_args {
|
|||
u32 block;
|
||||
u32 reclaim;
|
||||
u32 state;
|
||||
u32 monitor;
|
||||
u32 fsm_access;
|
||||
u32 fsm_mode;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -87,19 +82,4 @@ struct lockd_reboot {
|
|||
struct nsm_private priv;
|
||||
};
|
||||
|
||||
bool nlmsvc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_decode_notify(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
|
||||
bool nlmsvc_encode_testres(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_encode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_encode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
bool nlmsvc_encode_shareres(struct svc_rqst *rqstp, struct xdr_stream *xdr);
|
||||
|
||||
#endif /* _LOCKD_XDR_H */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user