minor changes
cosmetic: renaming do_recovery to recover_stateid removing client_state_remove() from setattr because we'll do it on close
This commit is contained in:
parent
168821c7fb
commit
1196182a8e
2 changed files with 2 additions and 8 deletions
|
|
@ -210,7 +210,7 @@ static int recover_client_state(
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool_t do_recovery(nfs_argop4 *argop, nfs41_session *session)
|
static bool_t recover_stateid(nfs_argop4 *argop, nfs41_session *session)
|
||||||
{
|
{
|
||||||
stateid_arg *stateid = NULL;
|
stateid_arg *stateid = NULL;
|
||||||
stateid4 *source = NULL;
|
stateid4 *source = NULL;
|
||||||
|
|
@ -398,7 +398,7 @@ restart_recovery:
|
||||||
if (!try_recovery)
|
if (!try_recovery)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (do_recovery(&compound->args.argarray[compound->res.resarray_count-1],
|
if (recover_stateid(&compound->args.argarray[compound->res.resarray_count-1],
|
||||||
session))
|
session))
|
||||||
goto retry;
|
goto retry;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
||||||
|
|
@ -481,12 +481,6 @@ static int handle_setattr(nfs41_upcall *upcall)
|
||||||
status = ERROR_NOT_SUPPORTED;
|
status = ERROR_NOT_SUPPORTED;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (args->set_class) {
|
|
||||||
case FileAllocationInformation:
|
|
||||||
case FileEndOfFileInformation:
|
|
||||||
client_state_remove(state);
|
|
||||||
}
|
|
||||||
out:
|
out:
|
||||||
free(args->buf);
|
free(args->buf);
|
||||||
return status;
|
return status;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue