summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2016-01-03 01:04:47 +0300
committerMike Marshall <hubcap@omnibond.com>2016-01-05 00:21:37 +0300
commitc146c0b87f7cef247744a649f8c1d794d18bfcb7 (patch)
tree88053f8d8bf3a21046a45efd50d997611bb02cf1
parentacaca36dd94d1bfe381a7425984991a06ba58f53 (diff)
downloadlinux-c146c0b87f7cef247744a649f8c1d794d18bfcb7.tar.xz
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>
-rw-r--r--fs/orangefs/orangefs-kernel.h4
-rw-r--r--fs/orangefs/orangefs-utils.c4
-rw-r--r--fs/orangefs/waitqueue.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index fe8284045a40..0c7a9cf9b8ef 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -576,9 +576,9 @@ void orangefs_op_initialize(struct orangefs_kernel_op_s *op);
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 fa2a46521b7a..f21233201ce3 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -633,7 +633,7 @@ void orangefs_make_bad_inode(struct inode *inode)
}
/* 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 @@ void block_signals(sigset_t *orig_sigset)
}
/* 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 856a4b48fe23..e1415e3882ba 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -80,7 +80,7 @@ retry_servicing:
/* 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 @@ retry_servicing:
*/
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 @@ retry_servicing:
}
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 */