evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

upcall: added upcall_cleanup() to interface

Browse source 
added call to upcall_cleanup() after both upcall_marshall() and upcall_cancel()
individual upcall operations define their nfs41_upcall_op structs locally, instead of putting tons of function prototypes in upcall.c
made the upcall_marshall() function optional; most marshall functions are noops

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-10-27 09:22:20 -04:00 • committed by unknown
parent 7e7f73766d
commit ae4c67c21e
12 changed files with 189 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

22
daemon/readwrite.c
View file

@ -30,10 +30,11 @@
#include "daemon_debug.h"
#include "util.h"
stateid4 special_read_stateid = {0xffffffff,
{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
int parse_rw(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
static int parse_rw(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
{
int status;
readwrite_upcall_args *args = &upcall->args.rw;
@ -144,7 +145,7 @@ out:
return status;
}
int handle_read(nfs41_upcall *upcall)
static int handle_read(nfs41_upcall *upcall)
{
stateid4 stateid, *pstateid;
readwrite_upcall_args *args = &upcall->args.rw;
@ -181,6 +182,7 @@ out:
return status;
}
/* NFS41_WRITE */
static int write_to_mds(
IN nfs41_session *session,
@ -267,7 +269,7 @@ out:
return status;
}
int handle_write(nfs41_upcall *upcall)
static int handle_write(nfs41_upcall *upcall)
{
stateid4 stateid, *pstateid = NULL;
readwrite_upcall_args *args = &upcall->args.rw;
@ -304,8 +306,20 @@ out:
return status;
}
int marshall_rw(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
static int marshall_rw(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
{
readwrite_upcall_args *args = &upcall->args.rw;
return safe_write(&buffer, length, &args->out_len, sizeof(args->out_len));
}
const nfs41_upcall_op nfs41_op_read = {
parse_rw,
handle_read,
marshall_rw
};
const nfs41_upcall_op nfs41_op_write = {
parse_rw,
handle_write,
marshall_rw
};