UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Make callbacks minor version generic 

I found a few places that hardcode the minor version number rather than
making it dependent on the protocol the callback came in over.  This
patch makes it easier to add new minor versions in the future.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Bryan Schumaker 2013-06-05 11:15:01 -04:00 committed by Trond Myklebust
parent f58eda9bc2
commit 459de2edb9
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfs/callback.h
View File

@ -39,6 +39,7 @@ struct cb_process_state {
__be32 drc_status; __be32 drc_status;
struct nfs_client *clp; struct nfs_client *clp;
u32 slotid; u32 slotid;
u32 minorversion;
struct net *net; struct net *net;
}; };

3
fs/nfs/callback_proc.c
View File

@ -406,7 +406,8 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args,
int i; int i;
__be32 status = htonl(NFS4ERR_BADSESSION); __be32 status = htonl(NFS4ERR_BADSESSION);
clp = nfs4_find_client_sessionid(cps->net, args->csa_addr, &args->csa_sessionid); clp = nfs4_find_client_sessionid(cps->net, args->csa_addr,
&args->csa_sessionid, cps->minorversion);
if (clp == NULL) if (clp == NULL)
goto out; goto out;

16
fs/nfs/callback_xdr.c
View File

@ -166,8 +166,8 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound
if (unlikely(p == NULL)) if (unlikely(p == NULL))
return htonl(NFS4ERR_RESOURCE); return htonl(NFS4ERR_RESOURCE);
hdr->minorversion = ntohl(*p++); hdr->minorversion = ntohl(*p++);
/* Check minor version is zero or one or two. */ /* Check for minor version support */
if (hdr->minorversion <= 2) { if (hdr->minorversion <= NFS4_MAX_MINOR_VERSION) {
hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 and v4.2 */ hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 and v4.2 */
} else { } else {
pr_warn_ratelimited("NFS: %s: NFSv4 server callback with " pr_warn_ratelimited("NFS: %s: NFSv4 server callback with "
@ -801,8 +801,7 @@ preprocess_nfs4_op(unsigned int op_nr, struct callback_op **op)
return htonl(NFS_OK); return htonl(NFS_OK);
} }
static __be32 process_op(uint32_t minorversion, int nop, static __be32 process_op(int nop, struct svc_rqst *rqstp,
struct svc_rqst *rqstp,
struct xdr_stream *xdr_in, void *argp, struct xdr_stream *xdr_in, void *argp,
struct xdr_stream *xdr_out, void *resp, struct xdr_stream *xdr_out, void *resp,
struct cb_process_state *cps) struct cb_process_state *cps)
@ -819,9 +818,9 @@ static __be32 process_op(uint32_t minorversion, int nop,
return status; return status;
dprintk("%s: minorversion=%d nop=%d op_nr=%u\n", dprintk("%s: minorversion=%d nop=%d op_nr=%u\n",
__func__, minorversion, nop, op_nr); __func__, cps->minorversion, nop, op_nr);
status = minorversion ? preprocess_nfs41_op(nop, op_nr, &op) : status = cps->minorversion ? preprocess_nfs41_op(nop, op_nr, &op) :
preprocess_nfs4_op(op_nr, &op); preprocess_nfs4_op(op_nr, &op);
if (status == htonl(NFS4ERR_OP_ILLEGAL)) if (status == htonl(NFS4ERR_OP_ILLEGAL))
op_nr = OP_CB_ILLEGAL; op_nr = OP_CB_ILLEGAL;
@ -885,14 +884,15 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r
return rpc_drop_reply; return rpc_drop_reply;
} }
cps.minorversion = hdr_arg.minorversion;
hdr_res.taglen = hdr_arg.taglen; hdr_res.taglen = hdr_arg.taglen;
hdr_res.tag = hdr_arg.tag; hdr_res.tag = hdr_arg.tag;
if (encode_compound_hdr_res(&xdr_out, &hdr_res) != 0) if (encode_compound_hdr_res(&xdr_out, &hdr_res) != 0)
return rpc_system_err; return rpc_system_err;
while (status == 0 && nops != hdr_arg.nops) { while (status == 0 && nops != hdr_arg.nops) {
status = process_op(hdr_arg.minorversion, nops, rqstp, status = process_op(nops, rqstp, &xdr_in,
&xdr_in, argp, &xdr_out, resp, &cps); argp, &xdr_out, resp, &cps);
nops++; nops++;
} }

2
fs/nfs/internal.h
View File

@ -165,7 +165,7 @@ extern void nfs_free_client(struct nfs_client *);
extern struct nfs_client *nfs4_find_client_ident(struct net *, int); extern struct nfs_client *nfs4_find_client_ident(struct net *, int);
extern struct nfs_client * extern struct nfs_client *
nfs4_find_client_sessionid(struct net *, const struct sockaddr *, nfs4_find_client_sessionid(struct net *, const struct sockaddr *,
struct nfs4_sessionid *); struct nfs4_sessionid *, u32);
extern struct nfs_server *nfs_create_server(struct nfs_mount_info *, extern struct nfs_server *nfs_create_server(struct nfs_mount_info *,
struct nfs_subversion *); struct nfs_subversion *);
extern struct nfs_server *nfs4_create_server( extern struct nfs_server *nfs4_create_server(

6
fs/nfs/nfs4client.c
View File

@ -567,14 +567,14 @@ static bool nfs4_cb_match_client(const struct sockaddr *addr,
*/ */
struct nfs_client * struct nfs_client *
nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr, nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
struct nfs4_sessionid *sid) struct nfs4_sessionid *sid, u32 minorversion)
{ {
struct nfs_client *clp; struct nfs_client *clp;
struct nfs_net *nn = net_generic(net, nfs_net_id); struct nfs_net *nn = net_generic(net, nfs_net_id);
spin_lock(&nn->nfs_client_lock); spin_lock(&nn->nfs_client_lock);
list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) { list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {
if (nfs4_cb_match_client(addr, clp, 1) == false) if (nfs4_cb_match_client(addr, clp, minorversion) == false)
continue; continue;
if (!nfs4_has_session(clp)) if (!nfs4_has_session(clp))
@ -597,7 +597,7 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
struct nfs_client * struct nfs_client *
nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr, nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
struct nfs4_sessionid *sid) struct nfs4_sessionid *sid, u32 minorversion)
{ {
return NULL; return NULL;
} }