diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-27 09:42:14 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-27 09:42:14 +0000 |
| commit | dadbcba95988f300109837415ddac820dedf60d4 (patch) | |
| tree | 5db50ff822bbda89b60e77423024d043b5f49b4f /cpukit | |
| parent | 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-dadbcba95988f300109837415ddac820dedf60d4.tar.bz2 | |
2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/nfs.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 53bdb7f492..86989f1835 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK, + NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number. + +2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/nfsclient/src/rpcio.c, libfs/src/nfsclient/src/rpcio.h: Use rpcprog_t for "program args", use rpcvers_t for "version args". diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c index ec158e8e7c..9ea63e54ee 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -157,14 +157,14 @@ static struct timeval _nfscalltimeout = { 10, 0 }; /* {secs, us } */ #define NFS_MAKE_DEV_T_INO_HACK(node) \ rtems_filesystem_make_dev_t( NFS_MAJOR, \ - (((node)->nfs->id)<<16) | (SERP_ATTR((node)).fileid >> 16) ) + (((rtems_device_minor_number)((node)->nfs->id))<<16) | (((rtems_device_minor_number)SERP_ATTR((node)).fileid) >> 16) ) /* use our 'nfs id' and the server's fsid for the minor device number * this should be fairly unique */ #define NFS_MAKE_DEV_T(node) \ rtems_filesystem_make_dev_t( NFS_MAJOR, \ - (((node)->nfs->id)<<16) | (SERP_ATTR((node)).fsid & ((1<<16)-1)) ) + (((rtems_device_minor_number)((node)->nfs->id))<<16) | (SERP_ATTR((node)).fsid & (((rtems_device_minor_number)1<<16)-1)) ) #define DIRENT_HEADER_SIZE ( sizeof(struct dirent) - \ sizeof( ((struct dirent *)0)->d_name ) ) |