OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NFS update 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4836 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-06-13 00:46:44 +00:00
parent 00de473558
commit 7f6145b1e1
5 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/nfs_proto.h
View File

@ -296,6 +296,7 @@ typedef enum
NFFIFO = 7 /* Named FIFO */
} nfstype;
#if 0
typedef struct
{
int32_t val[2];
@ -321,10 +322,11 @@ struct fhandle
};
typedef struct fhandle fhandle_t;
#endif
/* File Handle (32 bytes for version 2), variable up to 64 for version 3.
* This structures a variable sized and are provided only for setting aside
* maximum memory allocatins for a file handle.
/* File Handle variable is up to 64 bytes for version 3. This structures a
* ariable sized and are provided only for setting aside maximum memory
* allocations for a file handle.
*/
struct nfsfh

2
fs/nfs/nfs_util.c
View File

@ -331,7 +331,7 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
namelen = strlen(filename);
if (namelen > NAME_MAX)
{
fdbg("Length of \"%s\%too big: %d\n", namelen);
fdbg("Length of the string is too big: %d\n", namelen);
return E2BIG;
}

11
fs/nfs/nfs_vfsops.c
View File

@ -1890,17 +1890,6 @@ static int nfs_remove(struct inode *mountpt, const char *relpath)
goto errout_with_semaphore;
}
/* We found something at this path. Make sure that it is not a directory. */
#if 0 /* We have the attributes of the directory, not of the object to be deleted */
if (fxdr_unsigned(uint32_t, fattr.fa_type) == NFDIR)
{
fdbg("ERROR: \"%s\" is a directory\n", relpath);
error = EISDIR;
goto errout_with_semaphore;
}
#endif
/* Create the REMOVE RPC call arguments */
ptr = (FAR uint32_t *)&remove;

5
fs/nfs/rpc.h
View File

@ -202,11 +202,6 @@
* Public Types
****************************************************************************/
struct xidr
{
uint32_t xid;
};
/* Global RPC statistics */
#ifdef CONFIG_NFS_STATISTICS

32
fs/nfs/rpc_clnt.c
View File

@ -166,8 +166,8 @@ static uint32_t rpcclnt_newxid(void);
static void rpcclnt_fmtheader(FAR struct rpc_call_header *ch,
uint32_t xid, int procid, int prog, int vers);
static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int vers,
struct xidr *value, FAR const void *request,
size_t *reqlen, FAR void *msgbuf);
FAR const void *request, size_t *reqlen,
FAR void *msgbuf);
/****************************************************************************
* Private Functions
@ -553,8 +553,7 @@ static void rpcclnt_fmtheader(FAR struct rpc_call_header *ch,
/* Build the RPC header and fill in the authorization info. */
static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int vers,
struct xidr *value, FAR const void *request,
size_t *reqlen, FAR void *msgbuf)
FAR const void *request, size_t *reqlen, FAR void *msgbuf)
{
uint32_t xid;
@ -583,7 +582,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
}
@ -604,7 +602,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
else if (procid == RPCMNT_MOUNT)
@ -622,7 +619,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
}
@ -648,7 +644,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -670,7 +665,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -692,7 +686,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -714,7 +707,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -736,7 +728,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -755,7 +746,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -777,7 +767,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -796,7 +785,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -818,7 +806,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -840,7 +827,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -862,7 +848,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -881,7 +866,6 @@ static int rpcclnt_buildheader(struct rpcclnt *rpc, int procid, int prog, int ve
/* Format the message header */
rpcclnt_fmtheader(&callmsg->ch, xid, prog, vers, procid);
value->xid = callmsg->ch.rp_xid;
return 0;
}
@ -1253,12 +1237,10 @@ bad:
*/
int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
int version,
FAR const void *request, size_t reqlen,
int version, FAR const void *request, size_t reqlen,
FAR void *response, size_t resplen)
{
struct rpc_reply_header *replymsg;
struct xidr value;
uint32_t tmp;
int retries;
int error = 0;
@ -1312,7 +1294,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
/* Construct the RPC call messasge header */
error = rpcclnt_buildheader(rpc, procnum, prog, version, &value,
error = rpcclnt_buildheader(rpc, procnum, prog, version,
request, &reqlen, callmsg);
if (error != OK)
{
@ -1324,7 +1306,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
* number of re-tries will be attempted, but only for the case of response
* timeouts.
*/
retries = 0;
do
{
/* Do the client side RPC. */
@ -1352,7 +1334,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
retries++;
}
while (rpc->rc_callflags |= RPCCALL_MUSTRESEND && retries <= RPC_MAXREXMIT);
while ((rpc->rc_callflags & RPCCALL_MUSTRESEND) != 0 && retries <= RPC_MAXREXMIT);
if (error != OK)
{