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

[CVS commit program]

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

Modified Files:
      Tag: WALT3
	ncac-init.c ncac-list.h 
Log Message:
reverse merge of HEAD to WALT3 branch.


Index: ncac-init.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-init.c,v
diff -p -u -r1.5 -r1.5.4.1
--- ncac-init.c	18 May 2006 15:45:18 -0000	1.5
+++ ncac-init.c	19 Oct 2006 22:16:57 -0000	1.5.4.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: ncac-list.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/buffer/ncac-list.h,v
diff -p -u -r1.1 -r1.1.40.1
--- ncac-list.h	21 Aug 2003 18:57:27 -0000	1.1
+++ ncac-list.h	19 Oct 2006 22:16:57 -0000	1.1.40.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) );})