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

25
daemon/mount.c
View file

@ -30,8 +30,9 @@
#include "upcall.h"
#include "util.h"
/* NFS41_MOUNT */
int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
static int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
{
int status;
mount_upcall_args *args = &upcall->args.mount;
@ -47,7 +48,7 @@ out:
return status;
}
int handle_mount(nfs41_upcall *upcall)
static int handle_mount(nfs41_upcall *upcall)
{
int status;
mount_upcall_args *args = &upcall->args.mount;
@ -103,16 +104,22 @@ out_err:
goto out;
}
int marshall_mount(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
static int marshall_mount(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
{
mount_upcall_args *args = &upcall->args.mount;
dprintf(2, "NFS41_MOUNT: writing pointer to nfs41_root %p\n", args->root);
return safe_write(&buffer, length, &args->root, sizeof(args->root));
}
const nfs41_upcall_op nfs41_op_mount = {
parse_mount,
handle_mount,
marshall_mount
};
/* NFS41_UNMOUNT */
int parse_unmount(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
static int parse_unmount(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall)
{
int status;
unmount_upcall_args *args = &upcall->args.unmount;
@ -125,7 +132,7 @@ out:
return status;
}
int handle_unmount(nfs41_upcall *upcall)
static int handle_unmount(nfs41_upcall *upcall)
{
int status = NO_ERROR;
unmount_upcall_args *args = &upcall->args.unmount;
@ -133,7 +140,7 @@ int handle_unmount(nfs41_upcall *upcall)
return status;
}
int marshall_unmount(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
{
return NO_ERROR;
}
const nfs41_upcall_op nfs41_op_unmount = {
parse_unmount,
handle_unmount
};