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

[cosmetic] formating changes to recovery.c

Browse source
This commit is contained in:
Olga Kornievskaia 2011-08-24 18:01:30 -04:00
parent 969783d46b
commit 8683797d96
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
daemon/recovery.c
View file

@ -87,9 +87,8 @@ static int recover_open_grace(
claim.claim = CLAIM_PREVIOUS; claim.claim = CLAIM_PREVIOUS;
claim.u.prev.delegate_type = delegate_type; claim.u.prev.delegate_type = delegate_type;
return nfs41_open(session, parent, file, owner, return nfs41_open(session, parent, file, owner, &claim, access, deny,
&claim, access, deny, OPEN4_NOCREATE, 0, 0, FALSE, OPEN4_NOCREATE, 0, 0, FALSE, stateid, delegation, NULL);
stateid, delegation, NULL);
} }
static int recover_open_no_grace( static int recover_open_no_grace(
@ -240,18 +239,18 @@ static int recover_locks(
continue; continue;
if (*grace) if (*grace)
status = nfs41_lock(session, &open->file, status = nfs41_lock(session, &open->file, &open->owner,
&open->owner, lock->exclusive ? WRITE_LT : READ_LT, lock->exclusive ? WRITE_LT : READ_LT, lock->offset,
lock->offset, lock->length, TRUE, FALSE, &stateid); lock->length, TRUE, FALSE, &stateid);
else else
status = NFS4ERR_NO_GRACE; status = NFS4ERR_NO_GRACE;
if (status == NFS4ERR_NO_GRACE) { if (status == NFS4ERR_NO_GRACE) {
*grace = FALSE; *grace = FALSE;
/* attempt out-of-grace recovery with a normal LOCK */ /* attempt out-of-grace recovery with a normal LOCK */
status = nfs41_lock(session, &open->file, status = nfs41_lock(session, &open->file, &open->owner,
&open->owner, lock->exclusive ? WRITE_LT : READ_LT, lock->exclusive ? WRITE_LT : READ_LT, lock->offset,
lock->offset, lock->length, FALSE, FALSE, &stateid); lock->length, FALSE, FALSE, &stateid);
} }
if (status == NFS4ERR_BADSESSION) if (status == NFS4ERR_BADSESSION)
break; break;
@ -295,8 +294,8 @@ static int recover_delegation_want(
claim.claim = CLAIM_PREVIOUS; claim.claim = CLAIM_PREVIOUS;
claim.prev_delegate_type = delegate_type; claim.prev_delegate_type = delegate_type;
status = nfs41_want_delegation(session, &deleg->file, status = nfs41_want_delegation(session, &deleg->file, &claim,
&claim, want_flags, FALSE, &delegation); want_flags, FALSE, &delegation);
} else } else
status = NFS4ERR_NO_GRACE; status = NFS4ERR_NO_GRACE;
@ -305,8 +304,8 @@ static int recover_delegation_want(
/* attempt out-of-grace recovery with with CLAIM_DELEG_PREV_FH */ /* attempt out-of-grace recovery with with CLAIM_DELEG_PREV_FH */
claim.claim = CLAIM_DELEG_PREV_FH; claim.claim = CLAIM_DELEG_PREV_FH;
status = nfs41_want_delegation(session, &deleg->file, status = nfs41_want_delegation(session, &deleg->file, &claim,
&claim, want_flags, FALSE, &delegation); want_flags, FALSE, &delegation);
} }
if (status) if (status)
goto out; goto out;