[Pvfs2-cvs] commit by walt in pvfs2/src/apps/kernel/linux: module.mk.in pvfs2-client-core.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/apps/kernel/linux
In directory parlweb1:/tmp/cvs-serv23148/src/apps/kernel/linux

Modified Files:
      Tag: cu-sandbox-branch
	module.mk.in pvfs2-client-core.c 
Log Message:
Sam's prelude and scheduler updates


Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/module.mk.in,v
diff -p -u -r1.4 -r1.4.14.1
--- module.mk.in	13 Oct 2006 02:17:17 -0000	1.4
+++ module.mk.in	13 Feb 2008 19:49:00 -0000	1.4.14.1
@@ -14,3 +14,8 @@ endif
 # get kernel interface defines, and sysint client.h
 MODCFLAGS_$(DIR)/pvfs2-client-core.c = \
   -I$(srcdir)/src/kernel/linux-2.6
+
+# explicitly uses pthreads both threaded and not-threaded versions, even if
+# threading is turned off in the rest of libpvfs
+MODLDFLAGS_$(DIR)/pvfs2-client-core.o = -lpthread
+

Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.89 -r1.89.4.1
--- pvfs2-client-core.c	8 Oct 2007 22:32:50 -0000	1.89
+++ pvfs2-client-core.c	13 Feb 2008 19:49:00 -0000	1.89.4.1
@@ -1963,6 +1963,11 @@ static long encode_dirents(pvfs2_readdir
     ptr->token = readdir->token;
     ptr->directory_version = readdir->directory_version;
     ptr->pvfs_dirent_outcount = readdir->pvfs_dirent_outcount;
+
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
     *pptr += offsetof(pvfs2_readdir_response_t, dirent_array);
     for (i = 0; i < readdir->pvfs_dirent_outcount; i++) 
     {