From 4d905db121a5d1c3bb4962b66fc2d27d70412233 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 26 Jun 2009 09:14:58 +0000
Subject: [PATCH] o=Adilger i=Robert i=grev report patchless_client for kernel
 version

---
 lustre/obdclass/linux/linux-module.c | 3 ++-
 lustre/tests/sanity.sh               | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c
index a801349..46f30d8 100644
--- a/lustre/obdclass/linux/linux-module.c
+++ b/lustre/obdclass/linux/linux-module.c
@@ -245,7 +245,8 @@ int obd_proc_read_version(char *page, char **start, off_t off, int count,
                         BUILD_VERSION);
 #else
         return snprintf(page, count, "lustre: %s\nkernel: %s\nbuild:  %s\n",
-                        LUSTRE_VERSION_STRING, "patchless", BUILD_VERSION);
+                        LUSTRE_VERSION_STRING, "patchless_client",
+                        BUILD_VERSION);
 #endif
 }
 
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a3246fe..c50519f 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -90,11 +90,12 @@ setup() {
 }
 
 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
+	GOT_VER=$(lctl get_param -n version | awk '/kernel:/ {print $2}')
+	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
 }
-- 
1.8.3.1