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

[CVS commit program]

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

Modified Files:
      Tag: kunkel-migration-branch
	ncac-job.c ncac-init.c internal.h ncac-list.h ncac-locks.h 
Log Message:
Update migration branch to current CVS version


Index: ncac-job.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-job.c,v
diff -p -u -r1.10 -r1.10.10.1
--- ncac-job.c	27 May 2006 23:49:30 -0000	1.10
+++ ncac-job.c	17 Feb 2007 11:15:56 -0000	1.10.10.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-init.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-init.c,v
diff -p -u -r1.5 -r1.5.10.1
--- ncac-init.c	18 May 2006 15:45:18 -0000	1.5
+++ ncac-init.c	17 Feb 2007 11:15:56 -0000	1.5.10.1
@@ -89,7 +89,8 @@ int cache_init(NCAC_info_t *info)
 /* for radix tree if linux radix tree is not used */
 unsigned long radix_get_value(const void *item)
 {
-    return ((struct extent *)item)->index;
+    const struct extent *e = item;
+    return e->index;
 }
 
 static inline void init_free_extent_list(int num)

Index: internal.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/internal.h,v
diff -p -u -r1.5 -r1.5.22.1
--- internal.h	14 Dec 2005 21:50:21 -0000	1.5
+++ internal.h	17 Feb 2007 11:15:56 -0000	1.5.22.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-list.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-list.h,v
diff -p -u -r1.1 -r1.1.46.1
--- ncac-list.h	21 Aug 2003 18:57:27 -0000	1.1
+++ ncac-list.h	17 Feb 2007 11:15:56 -0000	1.1.46.1
@@ -197,7 +197,7 @@ static inline void list_splice_init(stru
  *
  */
 #define container_of(ptr, type, member) ({                      \
-        const __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
+        __typeof__( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})
 
 

Index: ncac-locks.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-locks.h,v
diff -p -u -r1.1 -r1.1.46.1
--- ncac-locks.h	21 Aug 2003 18:57:27 -0000	1.1
+++ ncac-locks.h	17 Feb 2007 11:15:56 -0000	1.1.46.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