- Many unused variable warning fixes (several of which were not really a

  problem, I think)
- list_splice_init() isn't defined in 2.4.18
- FSTYPE change for lov.sh

diff --git a/lnet/include/linux/portals_compat25.h b/lnet/include/linux/portals_compat25.h
index a6c13a8..c5e17a9 100644 (file)
--- a/lnet/include/linux/portals_compat25.h
+++ b/lnet/include/linux/portals_compat25.h
@@ -19,5 +19,6 @@
 # define THREAD_NAME(comm, fmt, a...)                                  \
         sprintf(comm, fmt "|%d", ## a, current->thread.mode.tt.extern_pid)
 #else
-# define THREAD_NAME(comm, fmt, a...) strcpy(comm, base, ## a)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+       sprintf(comm, fmt, ## a)
 #endif

diff --git a/lustre/portals/include/linux/portals_compat25.h b/lustre/portals/include/linux/portals_compat25.h
index a6c13a8..c5e17a9 100644 (file)
--- a/lustre/portals/include/linux/portals_compat25.h
+++ b/lustre/portals/include/linux/portals_compat25.h
@@ -19,5 +19,6 @@
 # define THREAD_NAME(comm, fmt, a...)                                  \
         sprintf(comm, fmt "|%d", ## a, current->thread.mode.tt.extern_pid)
 #else
-# define THREAD_NAME(comm, fmt, a...) strcpy(comm, base, ## a)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+       sprintf(comm, fmt, ## a)
 #endif