[Ocfs2-commits] manish commits r874 - trunk/src/inc

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-04-28 17:18:40 -0500 (Wed, 28 Apr 2004)
New Revision: 874

Modified:
   trunk/src/inc/ocfs.h
Log:
Made OCFS_GENERIC_SB_MEMBER and defined OCFS_GENERIC_SB_P in terms of that.
This is so we don't do a deprecated lvalue cast in super.c.


Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-04-28 01:37:20 UTC (rev 873)
+++ trunk/src/inc/ocfs.h	2004-04-28 22:18:40 UTC (rev 874)
@@ -1047,10 +1047,11 @@
 #endif /* >= 2.6.0  */
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#define OCFS_GENERIC_SB_P(sb)	((ocfs_super *)(sb->s_fs_info))
+#define OCFS_GENERIC_SB_MEMBER(sb)  ((sb)->s_fs_info)
 #else
-#define OCFS_GENERIC_SB_P(sb)	((ocfs_super *)(sb->u.generic_sbp))
+#define OCFS_GENERIC_SB_MEMBER(sb)  ((sb)->u.generic_sbp)
 #endif
+#define OCFS_GENERIC_SB_P(sb)	    ((ocfs_super *)OCFS_GENERIC_SB_MEMBER(sb))
 
 extern __u32 debug_context;
 extern __u32 debug_level;