NFS: Fix use of self-contained objects

Update #2843.
This commit is contained in:
Sebastian Huber
2018-02-07 08:57:18 +01:00
parent ea7f4a0ca1
commit e16111b2cf

View File

@@ -652,13 +652,13 @@ static struct nfsstats {
* linked ist of mounted NFS * linked ist of mounted NFS
* and the num_mounted_fs field * and the num_mounted_fs field
*/ */
rtems_id llock; rtems_recursive_mutex llock;
/* A lock for protecting misc /* A lock for protecting misc
* stuff within the driver. * stuff within the driver.
* The lock must only be held * The lock must only be held
* for short periods of time. * for short periods of time.
*/ */
rtems_id lock; rtems_recursive_mutex lock;
/* Our major number as assigned /* Our major number as assigned
* by RTEMS * by RTEMS
*/ */
@@ -691,7 +691,7 @@ static struct nfsstats {
*/ */
RpcUdpXactPool smallPool; RpcUdpXactPool smallPool;
RpcUdpXactPool bigPool; RpcUdpXactPool bigPool;
} nfsGlob = {0, 0, 0xffffffff, 0, 0, 0, NULL, NULL}; } nfsGlob = {RTEMS_RECURSIVE_MUTEX_INITIALIZER("NFS List"), RTEMS_RECURSIVE_MUTEX_INITIALIZER("NFS Misc"), 0xffffffff, 0, 0, 0, NULL, NULL};
/* /*
* Global variable to tune the 'st_blksize' (stat(2)) value this nfs * Global variable to tune the 'st_blksize' (stat(2)) value this nfs
@@ -3082,7 +3082,7 @@ typedef struct ResolvePathArgRec_ {
rtems_filesystem_location_info_t *loc; /* IN: location to resolve */ rtems_filesystem_location_info_t *loc; /* IN: location to resolve */
char *buf; /* IN/OUT: buffer where to put the path */ char *buf; /* IN/OUT: buffer where to put the path */
int len; /* IN: buffer length */ int len; /* IN: buffer length */
rtems_id sync; /* IN: synchronization */ rtems_binary_semaphore sync; /* IN: synchronization */
rtems_status_code status; /* OUT: result */ rtems_status_code status; /* OUT: result */
} ResolvePathArgRec, *ResolvePathArg; } ResolvePathArgRec, *ResolvePathArg;
@@ -3130,7 +3130,6 @@ rtems_status_code status;
arg.loc = loc; arg.loc = loc;
arg.buf = buf; arg.buf = buf;
arg.len = len; arg.len = len;
arg.sync = 0;
rtems_binary_semaphore_init(&arg.sync, "NFSress"); rtems_binary_semaphore_init(&arg.sync, "NFSress");