From: Elena Gryaznova <elena.gryaznova@oracle.com>
Date: Fri, 26 Nov 2010 16:36:06 +0000 (+0300)
Subject: b=24020 lustre doesn't start with ext4 based ldiskfs.
X-Git-Tag: 1.8.5.51~31
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=d64c0bb5df855f58d488194cff58e6d6b43566bd;p=fs%2Flustre-release.git

b=24020 lustre doesn't start with ext4 based ldiskfs.

i=Andrew.Perepechko
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 9d93b5c..e56e637 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -301,7 +301,8 @@ load_modules_local() {
         load_module mgs/mgs
         load_module mds/mds
         grep -q crc16 /proc/kallsyms || { modprobe crc16 2>/dev/null || true; }
-        grep -q jbd /proc/kallsyms || { modprobe jbd 2>/dev/null || true; }
+        grep -q -w jbd /proc/kallsyms || { modprobe jbd 2>/dev/null || true; }
+        grep -q -w jbd2 /proc/kallsyms || { modprobe jbd2 2>/dev/null || true; }
         [ "$FSTYPE" = "ldiskfs" ] && load_module ../ldiskfs/ldiskfs/ldiskfs
         load_module lvfs/fsfilt_$FSTYPE
         load_module ost/ost