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

recovery: use normal OPEN/LOCK on ERR_NO_GRACE

Browse source 
if we see NFS4ERR_NO_GRACE from recovery operations, it means we lost our state due to a lease expiration rather than a server reboot.  in this case, it's possible that conflicting locks were granted to other clients, so we have to try normal OPEN/LOCK operations to recover our state.  because they're sent during recovery, nfs41_open() and nfs41_lock() take a new 'bool_t try_recovery' argument so we can avoid recursion

if these operations fail due to conflicting locks, we have no choice but to return errors to the application.  using a stateid that was revoked due to lease expiration results in NFS4ERR_EXPIRED, and we map this error to ERROR_FILE_INVALID: The volume for a file has been externally altered so that the opened file is no longer valid.

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-11-30 13:10:30 -05:00 • committed by unknown
parent 222c1bf020
commit 0a309c4350
8 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
daemon/nfs41_ops.c
View file

@ -295,8 +295,9 @@ int nfs41_open(
IN uint32_t deny,
IN uint32_t create,
IN uint32_t mode,
IN bool_t try_recovery,
IN OUT nfs41_open_state *state,
OUT nfs41_file_info *info)
OUT OPTIONAL nfs41_file_info *info)
{
int status;
nfs41_compound compound;
@ -314,7 +315,10 @@ int nfs41_open(
nfs41_getattr_res getattr_res, pgetattr_res;
nfs41_savefh_res savefh_res;
nfs41_restorefh_res restorefh_res;
nfs41_file_info dir_info;
nfs41_file_info tmp_info, dir_info;
if (info == NULL)
info = &tmp_info;
init_getattr_request(&attr_request);
attr_request.arr[0] |= FATTR4_WORD0_FSID | FATTR4_WORD0_FILEID;
@ -367,7 +371,7 @@ int nfs41_open(
pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
pgetattr_res.info = &dir_info;
status = compound_encode_send_decode(session, &compound, TRUE);
status = compound_encode_send_decode(session, &compound, try_recovery);
if (status)
goto out;
@ -867,6 +871,7 @@ int nfs41_lock(
IN uint64_t offset,
IN uint64_t length,
IN bool_t reclaim,
IN bool_t try_recovery,
IN OUT stateid_arg *stateid)
{
int status;
@ -910,7 +915,7 @@ int nfs41_lock(
lock_res.u.resok4.lock_stateid = &stateid->stateid;
lock_res.u.denied.owner.owner_len = NFS4_OPAQUE_LIMIT;
status = compound_encode_send_decode(session, &compound, !reclaim);
status = compound_encode_send_decode(session, &compound, try_recovery);
if (status)
goto out;