LU-2850 kernel: 3.8 upstream kills daemonize()

[fs/lustre-release.git] / libcfs / libcfs / darwin / darwin-prim.c

diff --git a/libcfs/libcfs/darwin/darwin-prim.c b/libcfs/libcfs/darwin/darwin-prim.c
index 366a1ff..8e0901f 100644 (file)
--- a/libcfs/libcfs/darwin/darwin-prim.c
+++ b/libcfs/libcfs/darwin/darwin-prim.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -333,24 +333,29 @@ cfs_thread_agent (void)
 
 extern thread_t kernel_thread(task_t task, void (*start)(void));
 
-int
-cfs_kernel_thread(cfs_thread_t  func, void *arg, int flag)
-{
-        int ret = 0;
-        thread_t th = NULL;
-
-        thread_arg_hold(&cfs_thread_arg, func, arg);
-        th = kernel_thread(kernel_task, cfs_thread_agent);
-        thread_arg_release(&cfs_thread_arg);
-        if (th == THREAD_NULL)
+cfs_task_t
+kthread_run(cfs_thread_t func, void *arg, const char namefmt[], ...)
+{
+       int ret = 0;
+       thread_t th = NULL;
+
+       thread_arg_hold(&cfs_thread_arg, func, arg);
+       th = kernel_thread(kernel_task, cfs_thread_agent);
+       thread_arg_release(&cfs_thread_arg);
+       if (th != THREAD_NULL) {
+               /*
+                * FIXME: change child thread name...
+                * cfs_curproc_comm() is already broken. So it is left as is...
+               va_list args;
+               va_start(args, namefmt);
+               snprintf(cfs_curproc_comm(), CFS_CURPROC_COMM_MAX,
+                        namefmt, args);
+               va_end(args);
+                */
+       } else {
                 ret = -1;
-        return ret;
-}
-
-void cfs_daemonize(char *str)
-{
-        snprintf(cfs_curproc_comm(), CFS_CURPROC_COMM_MAX, "%s", str);
-        return;
+       }
+       return (cfs_task_t)((long)ret);
 }
 
 /*
@@ -362,10 +367,6 @@ void cfs_daemonize(char *str)
  * These signal functions almost do nothing now, we 
  * need to investigate more about signal in Darwin.
  */
-cfs_sigset_t cfs_get_blockedsigs()
-{
-        return (cfs_sigset_t)0;
-}
 
 extern int block_procsigmask(struct proc *p,  int bit);
 
@@ -379,13 +380,21 @@ cfs_sigset_t cfs_block_allsigs()
         return old;
 }
 
-cfs_sigset_t cfs_block_sigs(sigset_t bit)
+cfs_sigset_t cfs_block_sigs(unsigned long sigs)
 {
-        cfs_sigset_t    old = 0;
+       cfs_sigset_t    old = 0;
 #ifdef __DARWIN8__
 #else
-        block_procsigmask(current_proc(), bit);
+       block_procsigmask(current_proc(), sigs);
 #endif
+       return old;
+}
+
+/* Block all signals except for the @sigs. It's only used in
+ * Linux kernel, just a dummy here. */
+cfs_sigset_t cfs_block_sigsinv(unsigned long sigs)
+{
+        cfs_sigset_t old = 0;
         return old;
 }