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 fe8284045a40467874769d5eb36c2a24b0f454b6..0c7a9cf9b8ef29303cf10dfba553146a8db84fcf 100644 (file)
--- 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 fa2a46521b7aa4df6f325b9db56ff374ad5e52b3..f21233201ce3ad11778640016c43a73e5d862de7 100644 (file)
--- 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 856a4b48fe238463fb8ded1d1bf2e3944e03190c..e1415e3882ba527a6932d5a175b31556d4a7b862 100644 (file)
--- 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 */