[Ocfs2-commits] zab commits r1934 - in trunk: . fs/ocfs2 kapi-compat/include

[svn-commits at oss.oracle.com]

Author: zab
Date: 2005-03-02 14:04:12 -0600 (Wed, 02 Mar 2005)
New Revision: 1934

Added:
   trunk/kapi-compat/include/journal_access.h
Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/journal.c
Log:
o deal with the removal of jbd's credits pointer in a few functions


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-03-02 20:01:29 UTC (rev 1933)
+++ trunk/Config.make.in	2005-03-02 20:04:12 UTC (rev 1934)
@@ -62,6 +62,7 @@
 EXTRA_CFLAGS += @KAPI_COMPAT_CFLAGS@
 
 MISSING_SOCK_CREATE_LITE = @MISSING_SOCK_CREATE_LITE@
+JOURNAL_ACCESS_WITH_CREDITS = @JOURNAL_ACCESS_WITH_CREDITS@
 
 COMPAT_SAFE_WRITE = @COMPAT_SAFE_WRITE@
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-03-02 20:01:29 UTC (rev 1933)
+++ trunk/configure.in	2005-03-02 20:04:12 UTC (rev 1934)
@@ -330,6 +330,17 @@
   AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING([for journal access functions with a credits pointer])
+KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS journal_access.h"
+  JOURNAL_ACCESS_WITH_CREDITS=
+if grep "\<int \*credits);" "$KERNELINC/linux/jbd.h" >/dev/null 2>&1 ; then
+  AC_MSG_RESULT(yes)
+  JOURNAL_ACCESS_WITH_CREDITS=yes
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(JOURNAL_ACCESS_WITH_CREDITS)
+
 # using -include has two advantages:
 #  the source doesn't need to know to include compat headers
 #  the compat header file names don't go through the search path

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-03-02 20:01:29 UTC (rev 1933)
+++ trunk/fs/ocfs2/Makefile	2005-03-02 20:04:12 UTC (rev 1934)
@@ -30,6 +30,10 @@
 EXTRA_CFLAGS += -DOCFS_COMPAT_SAFE_WRITE
 endif
 
+ifdef JOURNAL_ACCESS_WITH_CREDITS
+EXTRA_CFLAGS += -DJOURNAL_ACCESS_WITH_CREDITS
+endif
+
 ifneq ($(QUIET),1)
 EXTRA_CFLAGS += -DVERBOSE_BH_JBD_TRACE
 EXTRA_CFLAGS += -DVERBOSE_LOCKING_TRACE

Modified: trunk/fs/ocfs2/journal.c
===================================================================
--- trunk/fs/ocfs2/journal.c	2005-03-02 20:01:29 UTC (rev 1933)
+++ trunk/fs/ocfs2/journal.c	2005-03-02 20:04:12 UTC (rev 1934)
@@ -502,11 +502,11 @@
 	switch (type) {
 	case OCFS_JOURNAL_ACCESS_CREATE:
 	case OCFS_JOURNAL_ACCESS_WRITE:
-		status = journal_get_write_access(handle->k_handle, bh, NULL);
+		status = kapi_journal_get_write_access(handle->k_handle, bh);
 		break;
 
 	case OCFS_JOURNAL_ACCESS_UNDO:
-		status = journal_get_undo_access(handle->k_handle, bh, NULL);
+		status = kapi_journal_get_undo_access(handle->k_handle, bh);
 		break;
 
 	default:

Added: trunk/kapi-compat/include/journal_access.h
===================================================================
--- trunk/kapi-compat/include/journal_access.h	2005-03-02 20:01:29 UTC (rev 1933)
+++ trunk/kapi-compat/include/journal_access.h	2005-03-02 20:04:12 UTC (rev 1934)
@@ -0,0 +1,26 @@
+#ifndef KAPI_JOURNAL_ACCESS_WITH_CREDITS_H
+#define KAPI_JOURNAL_ACCESS_WITH_CREDITS_H
+
+/* bzzz 1, universe 0 */
+
+#ifdef JOURNAL_ACCESS_WITH_CREDITS
+
+#define kapi_journal_get_write_access(a, b) \
+		journal_get_write_access(a, b, NULL)
+#define kapi_journal_get_read_access(a, b) \
+		journal_get_read_access(a, b, NULL)
+#define kapi_journal_get_undo_access(a, b) \
+		journal_get_undo_access(a, b, NULL)
+
+#else
+
+#define kapi_journal_get_write_access(a, b) \
+		journal_get_write_access(a, b)
+#define kapi_journal_get_read_access(a, b) \
+		journal_get_read_access(a, b)
+#define kapi_journal_get_undo_access(a, b) \
+		journal_get_undo_access(a, b)
+
+#endif
+
+#endif /* KAPI_JOURNAL_ACCESS_WITH_CREDITS_H */