Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1461 libcfs: Fix crypto not to use x86 pcmul for non x86 arch
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
user-prim.c
diff --git
a/libcfs/libcfs/user-prim.c
b/libcfs/libcfs/user-prim.c
index
e9652f0
..
e6aaaea
100644
(file)
--- 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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-284,26
+282,27
@@
int cfs_daemonize_ctxt(char *str)
cfs_sigset_t cfs_block_allsigs(void)
{
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_SETMAS
K, &all, &old);
-
LASSERT(rc == 0);
+ sigfillset(&all);
+
rc = sigprocmask(SIG_BLOC
K, &all, &old);
+ LASSERT(rc == 0);
-
return old;
+ return old;
}
}
-cfs_sigset_t cfs_block_sigs(
cfs_sigset_t block
s)
+cfs_sigset_t cfs_block_sigs(
unsigned long sig
s)
{
{
- cfs_sigset_t old;
- int rc;
+ cfs_sigset_t old;
+ cfs_sigset_t blocks = { { sigs } }; /* kludge */
+ int rc;
-
rc = sigprocmask(SIG_SETMAS
K, &blocks, &old);
-
LASSERT (rc == 0);
+
rc = sigprocmask(SIG_BLOC
K, &blocks, &old);
+ LASSERT (rc == 0);
-
return old;
+ return old;
}
/* Block all signals except for the @sigs. It's only used in
}
/* Block all signals except for the @sigs. It's only used in
@@
-379,10
+378,10
@@
void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no)
/* __linux__ */
#endif
/* __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! */
{
/* No libcfs_catastrophe in userspace! */
- libcfs_debug_msg(
NULL, 0, D_EMERG, file, func, line
, "LBUG\n");
+ libcfs_debug_msg(
msgdata
, "LBUG\n");
abort();
}
abort();
}