fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 12:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFS update

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4823 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-06-10 01:16:46 +00:00
parent 9932db67a4
commit 5504af82d3
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/fs/nfs/nfs_util.c
+26 -10
View File
@@ -312,6 +312,8 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
{ {
struct LOOKUP3args request; struct LOOKUP3args request;
struct rpc_reply_lookup response; struct rpc_reply_lookup response;
uint32_t *ptr;
uint32_t value;
int namelen; int namelen;
int error = 0; int error = 0;
@@ -321,8 +323,8 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
memset(&request, 0, sizeof(struct LOOKUP3args)); memset(&request, 0, sizeof(struct LOOKUP3args));
memset(&response, 0, sizeof(struct rpc_reply_lookup)); memset(&response, 0, sizeof(struct rpc_reply_lookup));
memset(&obj_attributes, 0, sizeof(struct nfs_fattr)); memset(obj_attributes, 0, sizeof(struct nfs_fattr));
memset(&dir_attributes, 0, sizeof(struct nfs_fattr)); memset(dir_attributes, 0, sizeof(struct nfs_fattr));
/* Get the length of the string to be sent */ /* Get the length of the string to be sent */
@@ -352,20 +354,34 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
return error; return error;
} }
/* Return the data to the caller's buffers */ /* Return the data to the caller's buffers. NOTE: Here we ignore the
* the exact layout of the rpc_reply_lookup structure. File handles
* may differ in size whereas struct rpc_reply_lookup uses a fixed size.
*/
memcpy(fhandle, &response.lookup.fshandle, sizeof(struct file_handle)); ptr = (uint32_t*)&response.lookup;
if (response.lookup.obj_attributes_follow != 0) /* Get the length of the file handle and return the file handle */
value = txdr_unsigned(*ptr) + sizeof(uint32_t);
memcpy(fhandle, ptr, value);
ptr += uint32_increment(value);
/* Check if there are object attributes and, if so, copy them to the user buffer */
value = *ptr++;
if (value)
{ {
memcpy(obj_attributes, &response.lookup.obj_attributes, memcpy(obj_attributes, ptr, sizeof(struct nfs_fattr));
sizeof(struct nfs_fattr)); ptr += uint32_increment(sizeof(struct nfs_fattr));
} }
if (response.lookup.dir_attributes_follow != 0) /* Check if there are directory attributes and, if so, copy them to the user buffer */
value = *ptr++;
if (value)
{ {
memcpy(dir_attributes, &response.lookup.dir_attributes, memcpy(dir_attributes, ptr, sizeof(struct nfs_fattr));
sizeof(struct nfs_fattr));
} }
return OK; return OK;
nuttx/fs/nfs/nfs_vfsops.c
+2 -2
View File
@@ -936,7 +936,7 @@ int nfs_readdirrpc(struct nfsmount *nmp, struct nfsnode *np,
* now points to the cookie. * now points to the cookie.
*/ */
ptr += (length + 3) >> 2; ptr += uint32_increment(length);
/* Save the cookie and increment the pointer to the next entry */ /* Save the cookie and increment the pointer to the next entry */
@@ -972,7 +972,7 @@ int nfs_readdirrpc(struct nfsmount *nmp, struct nfsnode *np,
/* Set the dirent file type */ /* Set the dirent file type */
switch (obj_attributes.fa_type) switch (fxdr_unsigned(uint32_t, obj_attributes.fa_type))
{ {
default: default:
case NFNON: /* Unknown type */ case NFNON: /* Unknown type */
nuttx/fs/nfs/xdr_subs.h
+2
View File
@@ -118,4 +118,6 @@
((uint32_t *)(t))[1] = htonl((uint32_t)((f) & 0xffffffff)); \ ((uint32_t *)(t))[1] = htonl((uint32_t)((f) & 0xffffffff)); \
} }
#define uint32_increment(b) (((b) + 3) >> 2)
#endif /* __FS_NFS_XDR_SUBS_H */ #endif /* __FS_NFS_XDR_SUBS_H */