sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFS should fail if EINTR is received

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4846 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-06-15 12:51:29 +00:00
parent 680d9ccc13
commit 7b3b3aadb2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/rpc_clnt.c
View File

@ -157,9 +157,7 @@ static void rpcclnt_fmtheader(FAR struct rpc_call_header *ch,
* This is the nfs send routine. * This is the nfs send routine.
* *
* Returned Value: * Returned Value:
* Returns EINTR if the RPC is terminated, 0 otherwise - set * Returns zero on success or a (positive) errno value on failure.
* RPCCALL_MUSTRESEND if the send fails for any reason - do anycleanup
* required by recoverable socket errors. *
* *
****************************************************************************/ ****************************************************************************/
@ -256,25 +254,25 @@ static int rpcclnt_reply(FAR struct rpcclnt *rpc, int procid, int prog,
* message again. * message again.
*/ */
if (error == EAGAIN || error == ETIMEDOUT || error == EINTR) if (error == EAGAIN || error == ETIMEDOUT)
{ {
rpc->rc_callflags |= RPCCALL_MUSTRESEND; rpc->rc_callflags |= RPCCALL_MUSTRESEND;
} }
return error; return error;
} }
/* Get the xid and check that it is an RPC replysvr */ /* Get the xid and check that it is an RPC replysvr */
replyheader = (FAR struct rpc_reply_header *)reply; replyheader = (FAR struct rpc_reply_header *)reply;
rxid = replyheader->rp_xid; rxid = replyheader->rp_xid;
if (replyheader->rp_direction != rpc_reply) if (replyheader->rp_direction != rpc_reply)
{ {
rpc_statistics(rpcinvalid);
fdbg("ERROR: Different RPC REPLY returned\n"); fdbg("ERROR: Different RPC REPLY returned\n");
rpc_statistics(rpcinvalid);
rpc->rc_callflags |= RPCCALL_MUSTRESEND; rpc->rc_callflags |= RPCCALL_MUSTRESEND;
error = EAGAIN; error = EPROTO;
return error; return error;
} }