[Pvfs2-cvs] commit by slang in pvfs2/src/io/buffer: internal.h ncac-job.c ncac-locks.h

CVS commit program cvs at parl.clemson.edu
Wed Apr 11 18:50:33 EDT 2007


Update of /projects/cvsroot/pvfs2/src/io/buffer
In directory parlweb1:/tmp/cvs-serv5206/src/io/buffer

Modified Files:
      Tag: WALT3
	internal.h ncac-job.c ncac-locks.h 
Log Message:
walt3 reverse merge from head includes merges of pw's sm changes (no state declarations), cleanup of state machine code, and other general merging/fixes.


Index: internal.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/internal.h,v
diff -p -u -r1.5 -r1.5.16.1
--- internal.h	14 Dec 2005 21:50:21 -0000	1.5
+++ internal.h	11 Apr 2007 22:50:33 -0000	1.5.16.1
@@ -15,7 +15,7 @@ typedef cache_desc_t NCAC_desc_t;
 typedef int          NCAC_optype;
 typedef cache_reply_t NCAC_reply_t;
 
-typedef pthread_mutex_t NCAC_lock;
+typedef gen_mutex_t NCAC_lock;
 
 struct NCAC_cache_info{
     int max_req_num;

Index: ncac-job.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-job.c,v
diff -p -u -r1.10 -r1.10.4.1
--- ncac-job.c	27 May 2006 23:49:30 -0000	1.10
+++ ncac-job.c	11 Apr 2007 22:50:33 -0000	1.10.4.1
@@ -53,7 +53,7 @@ static inline int add_extent_to_cache(st
 
 int NCAC_do_a_read_job(struct NCAC_req *ncac_req)
 {
-	int ret;
+    int ret;
     struct extent **cbufhash;
     PVFS_offset *foff;
     int *cbufflag;

Index: ncac-locks.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-locks.h,v
diff -p -u -r1.1 -r1.1.40.1
--- ncac-locks.h	21 Aug 2003 18:57:27 -0000	1.1
+++ ncac-locks.h	11 Apr 2007 22:50:33 -0000	1.1.40.1
@@ -3,15 +3,15 @@
 
 #include "gen-locks.h"
 
-#define spin_lock_init(x)       gen_posix_mutex_init(x)
-#define cache_lock(x)           gen_posix_mutex_lock(x)
-#define cache_unlock(x)         gen_posix_mutex_unlock(x)
+#define spin_lock_init(x)       gen_mutex_init(x)
+#define cache_lock(x)           gen_mutex_lock(x)
+#define cache_unlock(x)         gen_mutex_unlock(x)
 
-#define inode_lock(x)           gen_posix_mutex_lock(x)
-#define inode_unlock(x)         gen_posix_mutex_unlock(x)
+#define inode_lock(x)           gen_mutex_lock(x)
+#define inode_unlock(x)         gen_mutex_unlock(x)
 
-#define list_lock(x)            gen_posix_mutex_lock(x)
-#define list_unlock(x)          gen_posix_mutex_unlock(x)
+#define list_lock(x)            gen_mutex_lock(x)
+#define list_unlock(x)          gen_mutex_unlock(x)
 
 #endif
 



More information about the Pvfs2-cvs mailing list