From c2fa96360759b7a405c68966d9962ec382b00320 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Tue, 26 Aug 2008 11:17:55 +0000
Subject: [PATCH] Branch b1_8_gate Fix check_kernel_version() to handle new
 "patchless_client" output. Skip test 118k for remote OSTs, as with other test
 118. b=16516

---
 lustre/tests/sanity.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 732f3af..4e0228f 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -90,8 +90,10 @@ check_kernel_version() {
 	VERSION_FILE=version
 	WANT_VER=$1
 	GOT_VER=$(lctl get_param -n $VERSION_FILE | awk '/kernel:/ {print $2}')
-	[ $GOT_VER == "patchless" ] && return 0
-	[ $GOT_VER -ge $WANT_VER ] && return 0
+	case $GOT_VER in
+	patchless|patchless_client) return 0;;
+	*) [ $GOT_VER -ge $WANT_VER ] && return 0 ;;
+	esac
 	log "test needs at least kernel version $WANT_VER, running $GOT_VER"
 	return 1
 }
@@ -4639,6 +4641,8 @@ run_test 118j "Simulate unrecoverable OST side error =========="
 
 test_118k()
 {
+	remote_ost_nodsh && skip "remote OSTs" && return
+
 	#define OBD_FAIL_OST_BRW_WRITE_BULK      0x20e
 	set_nodes_failloc "$(osts_nodes)" 0x20e
 	mkdir -p $DIR/$tdir
-- 
1.8.3.1