LU-1346 libcfs: cleanup cfs_curproc_xxx macros

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

diff --git a/libcfs/libcfs/darwin/darwin-tracefile.c b/libcfs/libcfs/darwin/darwin-tracefile.c
index c0b5eff..2eb8b64 100644 (file)
--- a/libcfs/libcfs/darwin/darwin-tracefile.c
+++ b/libcfs/libcfs/darwin/darwin-tracefile.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.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,7 +24,7 @@
  * 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.
  */
 /*
@@ -68,6 +66,7 @@ int tracefile_init_arch() {
 }
 
 void tracefile_fini_arch() {
+    fini_rwsem(&tracefile_sem);
 }
 
 void tracefile_read_lock() {
@@ -123,7 +122,7 @@ struct trace_cpu_data *trace_get_tcd(void)
        tcd = &trace_data[0].tcd;
         CFS_INIT_LIST_HEAD(&pages);
        if (get_preemption_level() == 0)
-               nr_pages = trace_refill_stock(tcd, CFS_ALLOC_STD, &pages);
+               nr_pages = trace_refill_stock(tcd, GFP_IOFS, &pages);
        else
                nr_pages = 0;
        spin_lock(&trace_cpu_serializer);
@@ -161,7 +160,7 @@ int tcd_owns_tage(struct trace_cpu_data *tcd, struct trace_page *tage)
 
 void
 set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask,
-                   const int line, unsigned long stack)
+                    const int line, unsigned long stack)
 {
        struct timeval tv;
        
@@ -173,10 +172,11 @@ set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask,
        header->ph_subsys = subsys;
        header->ph_mask = mask;
        header->ph_cpu_id = smp_processor_id();
+       header->ph_type = 0;
        header->ph_sec = (__u32)tv.tv_sec;
        header->ph_usec = tv.tv_usec;
        header->ph_stack = stack;
-       header->ph_pid = cfs_curproc_pid();
+       header->ph_pid = current_pid();
        header->ph_line_num = line;
        header->ph_extern_pid = (__u32)current_thread();
 }
@@ -217,9 +217,3 @@ int trace_max_debug_mb(void)
 {
        return max_permit_mb;
 }
-
-void
-trace_call_on_all_cpus(void (*fn)(void *arg), void *arg)
-{
-#error "tbd"
-}