X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Fuser-prim.c;h=e6aaaeac996ee359128e646b787db70d08decd1a;hp=0529581d7597d9e1594d157ff0d106f86298e3af;hb=220c6d92200792c318f5248e8e44dbcfc712c788;hpb=adb6cea0b70ac465b2a47635d9dc45d64ab1605b

diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index 0529581..e6aaaea 100644
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-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.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -282,26 +282,27 @@ int cfs_daemonize_ctxt(char *str)
 
 cfs_sigset_t cfs_block_allsigs(void)
 {
-        cfs_sigset_t   all;
-        cfs_sigset_t   old;
-        int            rc;
+	cfs_sigset_t   all;
+	cfs_sigset_t   old;
+	int            rc;
 
-        sigfillset(&all);
-        rc = sigprocmask(SIG_SETMASK, &all, &old);
-        LASSERT(rc == 0);
+	sigfillset(&all);
+	rc = sigprocmask(SIG_BLOCK, &all, &old);
+	LASSERT(rc == 0);
 
-        return old;
+	return old;
 }
 
-cfs_sigset_t cfs_block_sigs(cfs_sigset_t blocks)
+cfs_sigset_t cfs_block_sigs(unsigned long sigs)
 {
-        cfs_sigset_t   old;
-        int   rc;
+	cfs_sigset_t   old;
+	cfs_sigset_t   blocks = { { sigs } }; /* kludge */
+	int   rc;
 
-        rc = sigprocmask(SIG_SETMASK, &blocks, &old);
-        LASSERT (rc == 0);
+	rc = sigprocmask(SIG_BLOCK, &blocks, &old);
+	LASSERT (rc == 0);
 
-        return old;
+	return old;
 }
 
 /* Block all signals except for the @sigs. It's only used in
@@ -377,10 +378,10 @@ void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no)
 /* __linux__ */
 #endif
 
-void lbug_with_loc(const char *file, const char *func, const int line)
+void lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
 {
         /* No libcfs_catastrophe in userspace! */
-        libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line, "LBUG\n");
+        libcfs_debug_msg(msgdata, "LBUG\n");
         abort();
 }