提交 c146c0b8 编写于 作者: R Richard Weinberger 提交者: Mike Marshall

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: NRichard Weinberger <richard@nod.at>
Signed-off-by: NMartin Brandenburg <martin@omnibond.com>
Signed-off-by: NMike Marshall <hubcap@omnibond.com>
上级 acaca36d
......@@ -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);
......
......@@ -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);
}
......
......@@ -80,7 +80,7 @@ int service_operation(struct orangefs_kernel_op_s *op,
/* 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 @@ int service_operation(struct orangefs_kernel_op_s *op,
*/
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 @@ int service_operation(struct orangefs_kernel_op_s *op,
}
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 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册