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-1299 clio: a combo patch to fix cl_lock
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
user-prim.c
diff --git
a/libcfs/libcfs/user-prim.c
b/libcfs/libcfs/user-prim.c
index
c02a951
..
e6aaaea
100644
(file)
--- a/
libcfs/libcfs/user-prim.c
+++ b/
libcfs/libcfs/user-prim.c
@@
-282,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