From c62b26eb7802a0b22776e3ba390e6ba2c1ccc7d2 Mon Sep 17 00:00:00 2001 From: nikita Date: Mon, 14 Jan 2008 01:12:18 +0000 Subject: [PATCH] merge with HEAD --- lnet/include/libcfs/linux/linux-prim.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lnet/include/libcfs/linux/linux-prim.h b/lnet/include/libcfs/linux/linux-prim.h index 9ae57cd..705499e 100644 --- a/lnet/include/libcfs/linux/linux-prim.h +++ b/lnet/include/libcfs/linux/linux-prim.h @@ -125,7 +125,19 @@ typedef long cfs_task_state_t; /* Kernel thread */ typedef int (*cfs_thread_t)(void *); -#define cfs_kernel_thread(func, a, f) kernel_thread(func, a, f) + +static inline int cfs_kernel_thread(int (*fn)(void *), + void *arg, unsigned long flags) +{ + void *orig_info = current->journal_info; + int rc; + + current->journal_info = NULL; + rc = kernel_thread(fn, arg, flags); + current->journal_info = orig_info; + return rc; +} + /* * Task struct -- 1.8.3.1