[Ocfs2-commits] smushran commits r3005 - in branches/ocfs2-1.2: .
fs/ocfs2/cluster
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Apr 16 14:43:35 PDT 2007
Author: smushran
Date: 2007-04-16 14:43:34 -0700 (Mon, 16 Apr 2007)
New Revision: 3005
Modified:
branches/ocfs2-1.2/Makefile
branches/ocfs2-1.2/configure.in
branches/ocfs2-1.2/fs/ocfs2/cluster/quorum.c
Log:
ocfs2: Use emergency_restart() for fencing
machine_restart() is not exported in mainline (2.6.20).
Signed-off-by: jlbec
Modified: branches/ocfs2-1.2/Makefile
===================================================================
--- branches/ocfs2-1.2/Makefile 2007-04-16 21:40:58 UTC (rev 3004)
+++ branches/ocfs2-1.2/Makefile 2007-04-16 21:43:34 UTC (rev 3005)
@@ -17,7 +17,8 @@
kapi-compat/include/kref_put.h \
kapi-compat/include/sparse_endian_types.h \
kapi-compat/include/kzalloc.h \
- kapi-compat/include/simple_pin_fs.h
+ kapi-compat/include/simple_pin_fs.h \
+ kapi-compat/include/reboot.h
PATCH_FILES = \
patches/export_generic_drop_inode.patch
Modified: branches/ocfs2-1.2/configure.in
===================================================================
--- branches/ocfs2-1.2/configure.in 2007-04-16 21:40:58 UTC (rev 3004)
+++ branches/ocfs2-1.2/configure.in 2007-04-16 21:43:34 UTC (rev 3005)
@@ -248,6 +248,11 @@
KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS simple_pin_fs.h"
AC_SUBST(OLD_SIMPLE_PIN_FS)
+reboot_compat_header=""
+OCFS2_CHECK_KERNEL([for emergency_restart], reboot.h,
+ , reboot_compat_header="reboot.h", [emergency_restart])
+KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $reboot_compat_header"
+
GET_SB_RETURNS_SB=
OCFS2_CHECK_KERNEL([get_sb which returns a struct super_block *], fs.h,
GET_SB_RETURNS_SB=yes, , [struct super_block \*get_sb])
Modified: branches/ocfs2-1.2/fs/ocfs2/cluster/quorum.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/cluster/quorum.c 2007-04-16 21:40:58 UTC (rev 3004)
+++ branches/ocfs2-1.2/fs/ocfs2/cluster/quorum.c 2007-04-16 21:43:34 UTC (rev 3005)
@@ -81,7 +81,7 @@
panic("*** ocfs2 is very sorry to be fencing this system by panicing ***\n");
default:
printk("*** ocfs2 is very sorry to be fencing this system by restarting ***\n");
- machine_restart(NULL);
+ emergency_restart();
}
}
More information about the Ocfs2-commits
mailing list