From: Richard Weinberger <richard@nod.at>
To: martin@omnibond.com
Cc: viro@ZenIV.linux.org.uk, arnd@arndb.de, yi9@clemson.edu,
linux-kernel@vger.kernel.org, Richard Weinberger <richard@nod.at>
Subject: [PATCH] orangefs: Don't pollute global namespace
Date: Sat, 2 Jan 2016 23:04:47 +0100 [thread overview]
Message-ID: <1451772287-5447-1-git-send-email-richard@nod.at> (raw)
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>
---
fs/orangefs/orangefs-kernel.h | 4 ++--
fs/orangefs/orangefs-utils.c | 4 ++--
fs/orangefs/waitqueue.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
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_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 fa2a465..f212332 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 856a4b4..e1415e3 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 */
--
1.8.4.5
next reply other threads:[~2016-01-02 22:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-02 22:04 Richard Weinberger [this message]
2016-01-02 22:06 ` Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451772287-5447-1-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=martin@omnibond.com \
--cc=viro@ZenIV.linux.org.uk \
--cc=yi9@clemson.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®