orangefs: Don't pollute global namespace
Prefix public functions with "orangefs_" do don't
pollute the global namespace.
This fixes a build issue on UML which also has block_signals().
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index fe82840..0c7a9cf 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -576,9 +576,9 @@
void orangefs_make_bad_inode(struct inode *inode);
-void block_signals(sigset_t *);
+void orangefs_block_signals(sigset_t *);
-void set_signals(sigset_t *);
+void orangefs_set_signals(sigset_t *);
int orangefs_unmount_sb(struct super_block *sb);
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index fa2a4652..f212332 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -633,7 +633,7 @@
}
/* Block all blockable signals... */
-void block_signals(sigset_t *orig_sigset)
+void orangefs_block_signals(sigset_t *orig_sigset)
{
sigset_t mask;
@@ -648,7 +648,7 @@
}
/* set the signal mask to the given template... */
-void set_signals(sigset_t *sigset)
+void orangefs_set_signals(sigset_t *sigset)
{
sigprocmask(SIG_SETMASK, sigset, NULL);
}
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index 856a4b4..e1415e3 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -80,7 +80,7 @@
/* mask out signals if this operation is not to be interrupted */
if (!(flags & ORANGEFS_OP_INTERRUPTIBLE))
- block_signals(&orig_sigset);
+ orangefs_block_signals(&orig_sigset);
if (!(flags & ORANGEFS_OP_NO_SEMAPHORE)) {
ret = mutex_lock_interruptible(&request_mutex);
@@ -90,7 +90,7 @@
*/
if (ret < 0) {
if (!(flags & ORANGEFS_OP_INTERRUPTIBLE))
- set_signals(&orig_sigset);
+ orangefs_set_signals(&orig_sigset);
op->downcall.status = ret;
gossip_debug(GOSSIP_WAIT_DEBUG,
"orangefs: service_operation interrupted.\n");
@@ -160,7 +160,7 @@
}
if (!(flags & ORANGEFS_OP_INTERRUPTIBLE))
- set_signals(&orig_sigset);
+ orangefs_set_signals(&orig_sigset);
BUG_ON(ret != op->downcall.status);
/* retry if operation has not been serviced and if requested */
