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

recovery: remember byte-range locks and reclaim during recovery

Browse source 
nfs41_open_state maintains a list of outstanding byte-range locks by calling open_lock_add() and open_lock_remove() in lock.c

during client state recovery, after reclaiming each OPEN stateid, send LOCK requests with reclaim=TRUE for each lock it owns, and update the open's lock stateid with the result

added 'bool_t reclaim' argument to nfs41_lock(); when set, compound_encode_send_decode() is called with try_recovery=FALSE to avoid recursive recovery

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-11-18 15:11:36 -05:00 • committed by unknown
parent 1906610544
commit 222c1bf020
7 changed files with 141 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/nfs41_ops.c
View file

@ -866,6 +866,7 @@ int nfs41_lock(
IN uint32_t type,
IN uint64_t offset,
IN uint64_t length,
IN bool_t reclaim,
IN OUT stateid_arg *stateid)
{
int status;
@ -892,7 +893,7 @@ int nfs41_lock(
compound_add_op(&compound, OP_LOCK, &lock_args, &lock_res);
lock_args.locktype = type;
lock_args.reclaim = 0;
lock_args.reclaim = reclaim;
lock_args.offset = offset;
lock_args.length = length;
if (stateid->type == STATEID_LOCK) {
@ -909,11 +910,14 @@ 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, TRUE);
status = compound_encode_send_decode(session, &compound, !reclaim);
if (status)
goto out;
compound_error(status = compound.res.status);
if (compound_error(status = compound.res.status))
goto out;
stateid->type = STATEID_LOCK; /* returning a lock stateid */
out:
return status;
}