hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Add in v4.2 callback operation

Browse Source 
NFS v4.2 adds a CB_OFFLOAD operation used by COPY and WRITE_PLUS.  Since
neither of these operations have been implemented yet, simply return
NFS4ERR_NOTSUPP.

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:02 -04:00 committed by Trond Myklebust
parent 459de2edb9
commit 6b140b85d9
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/callback.h
View File

@ -32,6 +32,8 @@ enum nfs4_callback_opnum {
OP_CB_WANTS_CANCELLED = 12, OP_CB_WANTS_CANCELLED = 12,
OP_CB_NOTIFY_LOCK = 13, OP_CB_NOTIFY_LOCK = 13,
OP_CB_NOTIFY_DEVICEID = 14, OP_CB_NOTIFY_DEVICEID = 14,
/* Callback operations new to NFSv4.2 */
OP_CB_OFFLOAD = 15,
OP_CB_ILLEGAL = 10044, OP_CB_ILLEGAL = 10044,
}; };

36
fs/nfs/callback_xdr.c
View File

@ -786,6 +786,26 @@ static void nfs4_cb_free_slot(struct cb_process_state *cps)
} }
#endif /* CONFIG_NFS_V4_1 */ #endif /* CONFIG_NFS_V4_1 */
#ifdef CONFIG_NFS_V4_2
static __be32
preprocess_nfs42_op(int nop, unsigned int op_nr, struct callback_op **op)
{
__be32 status = preprocess_nfs41_op(nop, op_nr, op);
if (status != htonl(NFS4ERR_OP_ILLEGAL))
return status;
if (op_nr == OP_CB_OFFLOAD)
return htonl(NFS4ERR_NOTSUPP);
return htonl(NFS4ERR_OP_ILLEGAL);
}
#else /* CONFIG_NFS_V4_2 */
static __be32
preprocess_nfs42_op(int nop, unsigned int op_nr, struct callback_op **op)
{
return htonl(NFS4ERR_MINOR_VERS_MISMATCH);
}
#endif /* CONFIG_NFS_V4_2 */
static __be32 static __be32
preprocess_nfs4_op(unsigned int op_nr, struct callback_op **op) preprocess_nfs4_op(unsigned int op_nr, struct callback_op **op)
{ {
@ -820,8 +840,20 @@ static __be32 process_op(int nop, struct svc_rqst *rqstp,
dprintk("%s: minorversion=%d nop=%d op_nr=%u\n", dprintk("%s: minorversion=%d nop=%d op_nr=%u\n",
__func__, cps->minorversion, nop, op_nr); __func__, cps->minorversion, nop, op_nr);
status = cps->minorversion ? preprocess_nfs41_op(nop, op_nr, &op) : switch (cps->minorversion) {
preprocess_nfs4_op(op_nr, &op); case 0:
status = preprocess_nfs4_op(op_nr, &op);
break;
case 1:
status = preprocess_nfs41_op(nop, op_nr, &op);
break;
case 2:
status = preprocess_nfs42_op(nop, op_nr, &op);
break;
default:
status = htonl(NFS4ERR_MINOR_VERS_MISMATCH);
}
if (status == htonl(NFS4ERR_OP_ILLEGAL)) if (status == htonl(NFS4ERR_OP_ILLEGAL))
op_nr = OP_CB_ILLEGAL; op_nr = OP_CB_ILLEGAL;
if (status) if (status)