summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-07-16 20:02:32 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-07-16 20:02:32 +0000
commit4aacbc81f3605dff6918490c271acb50413deed1 (patch)
treed0595d76a9cb08e4735b00208283501bcab501c2
parent1bc58c13f53a377b2deea6ad771d2949af51416c (diff)
2007-07-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* proto/nfs_prot_xdr.c: Id string change. * src/Makefile: Fix install point of .h files. * src/nfs.c: Add some more debug.
-rw-r--r--rtemsNfs/ChangeLog6
-rw-r--r--rtemsNfs/src/Makefile2
-rw-r--r--rtemsNfs/src/nfs.c13
3 files changed, 20 insertions, 1 deletions
diff --git a/rtemsNfs/ChangeLog b/rtemsNfs/ChangeLog
index b859d01..cdc221b 100644
--- a/rtemsNfs/ChangeLog
+++ b/rtemsNfs/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-16 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * proto/nfs_prot_xdr.c: Id string change.
+ * src/Makefile: Fix install point of .h files.
+ * src/nfs.c: Add some more debug.
+
2006-08-30 Joel Sherrill <joel@OARcorp.com>
* src/rpcio.c: Remove printf format warnings.
diff --git a/rtemsNfs/src/Makefile b/rtemsNfs/src/Makefile
index 8797fcf..6bb7321 100644
--- a/rtemsNfs/src/Makefile
+++ b/rtemsNfs/src/Makefile
@@ -102,4 +102,4 @@ tar:
install: all
$(INSTALL_VARIANT) -m 555 ${PGMS} ${RTEMS_SITE_INSTALLDIR}/bin
$(INSTALL_VARIANT) -m 555 ${LIB} ${RTEMS_SITE_INSTALLDIR}/lib
- $(INSTALL_CHANGE) -m 444 ${INST_HEADERS} ${RTEMS_SITE_INSTALLDIR}/include
+ $(INSTALL_CHANGE) -m 444 ${INST_HEADERS} ${RTEMS_SITE_INSTALLDIR}/lib/include
diff --git a/rtemsNfs/src/nfs.c b/rtemsNfs/src/nfs.c
index c95e39a..236e8f1 100644
--- a/rtemsNfs/src/nfs.c
+++ b/rtemsNfs/src/nfs.c
@@ -159,6 +159,7 @@ static struct timeval _nfscalltimeout = { 10, 0 }; /* {secs, us } */
#define DEBUG_EVALPATH (1<<2)
#define DEBUG_READDIR (1<<3)
#define DEBUG_SYSCALLS (1<<4)
+#define DEBUG_INIT (1<<5)
/* #define DEBUG ( DEBUG_SYSCALLS | DEBUG_COUNT_NODES ) */
@@ -1902,6 +1903,9 @@ char *path = mt_entry->dev;
/* first, try to ping the NFS server by
* calling the NULL proc.
*/
+#if DEBUG & DEBUG_INIT
+ printf( "---> NFS Ping server\n" );
+#endif
if ( nfscall(nfsServer,
NFSPROC_NULL,
(xdrproc_t)xdr_void, 0,
@@ -1924,6 +1928,9 @@ char *path = mt_entry->dev;
*/
saddr.sin_port = 0;
+#if DEBUG & DEBUG_INIT
+ printf( "---> NFS make mount call\n" );
+ rtems_time_of_day time;
stat = mntcall( &saddr,
MOUNTPROC_MNT,
(xdrproc_t)xdr_dirpath,
@@ -1952,6 +1959,9 @@ char *path = mt_entry->dev;
/* that seemed to work - we now create the root node
* and we also must obtain the root node attributes
*/
+#if DEBUG & DEBUG_INIT
+ printf( "---> NFS remote node attributes\n" );
+#endif
assert( rootNode = nfsNodeCreate(nfs, (nfs_fh*)&fhstat.fhstatus_u.fhs_fhandle ) );
if ( updateAttr(rootNode, 1 /* force */) ) {
@@ -1982,6 +1992,9 @@ char *path = mt_entry->dev;
e = 0;
cleanup:
+#if DEBUG & DEBUG_INIT
+ printf( "---> NFS mount cleanup\n" );
+#endif
if (nfs)
nfsDestroy(nfs);
if (nfsServer)