From 6bc2c5d8aff4fc1f8dbc8aa19b86f6cf44b78419 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 23 Jan 2012 15:17:55 -0700 Subject: [PATCH] LU-506 tests: modprobe exportfs for fsfilt_ldiskfs When trying to load fsfilt_ldiskfs.ko from the build tree, it fails to load due to the missing exportfs_decode_fh() symbol in RHEL6 kernels. Force loading of the exportfs.ko module if ldiskfs is used. Signed-off-by: Andreas Dilger Change-Id: Iecb13155b69ffc3a227e3df770ca590277cd500c Reviewed-on: http://review.whamcloud.com/2014 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Niu Yawei Reviewed-by: Johann Lombardi --- lustre/tests/test-framework.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index aea4063..cca6f0c 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -376,10 +376,15 @@ load_modules_local() { load_module lov/lov load_module mgc/mgc if ! client_only; then - grep -q crc16 /proc/kallsyms || { modprobe crc16 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 + SYMLIST=/proc/kallsyms + grep -q crc16 $SYMLIST || { modprobe crc16 2>/dev/null || true; } + grep -q -w jbd $SYMLIST || { modprobe jbd 2>/dev/null || true; } + grep -q -w jbd2 $SYMLIST || { modprobe jbd2 2>/dev/null || true; } + if [ "$FSTYPE" = "ldiskfs" ]; then + grep -q exportfs_decode_fh $SYMLIST || + { modprobe exportfs 2> /dev/null || true; } + load_module ../ldiskfs/ldiskfs/ldiskfs + fi load_module mgs/mgs load_module mds/mds load_module mdd/mdd -- 1.8.3.1