AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

orangefs: Don't pollute global namespace

Browse Source 
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>
This commit is contained in:
Richard Weinberger 2016-01-02 23:04:47 +01:00 committed by Mike Marshall
parent acaca36dd9
commit c146c0b87f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/orangefs/orangefs-kernel.h
View File

@ -576,9 +576,9 @@ void orangefs_op_initialize(struct orangefs_kernel_op_s *op);
void orangefs_make_bad_inode(struct inode *inode); 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); int orangefs_unmount_sb(struct super_block *sb);

4
fs/orangefs/orangefs-utils.c
View File

@ -633,7 +633,7 @@ void orangefs_make_bad_inode(struct inode *inode)
} }
/* Block all blockable signals... */ /* Block all blockable signals... */
void block_signals(sigset_t *orig_sigset) void orangefs_block_signals(sigset_t *orig_sigset)
{ {
sigset_t mask; sigset_t mask;
@ -648,7 +648,7 @@ void block_signals(sigset_t *orig_sigset)
} }
/* set the signal mask to the given template... */ /* 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); sigprocmask(SIG_SETMASK, sigset, NULL);
} }

6
fs/orangefs/waitqueue.c
View File

@ -80,7 +80,7 @@ int service_operation(struct orangefs_kernel_op_s *op,
/* mask out signals if this operation is not to be interrupted */ /* mask out signals if this operation is not to be interrupted */
if (!(flags & ORANGEFS_OP_INTERRUPTIBLE)) if (!(flags & ORANGEFS_OP_INTERRUPTIBLE))
block_signals(&orig_sigset); orangefs_block_signals(&orig_sigset);
if (!(flags & ORANGEFS_OP_NO_SEMAPHORE)) { if (!(flags & ORANGEFS_OP_NO_SEMAPHORE)) {
ret = mutex_lock_interruptible(&request_mutex); ret = mutex_lock_interruptible(&request_mutex);
@ -90,7 +90,7 @@ int service_operation(struct orangefs_kernel_op_s *op,
*/ */
if (ret < 0) { if (ret < 0) {
if (!(flags & ORANGEFS_OP_INTERRUPTIBLE)) if (!(flags & ORANGEFS_OP_INTERRUPTIBLE))
set_signals(&orig_sigset); orangefs_set_signals(&orig_sigset);
op->downcall.status = ret; op->downcall.status = ret;
gossip_debug(GOSSIP_WAIT_DEBUG, gossip_debug(GOSSIP_WAIT_DEBUG,
"orangefs: service_operation interrupted.\n"); "orangefs: service_operation interrupted.\n");
@ -160,7 +160,7 @@ int service_operation(struct orangefs_kernel_op_s *op,
} }
if (!(flags & ORANGEFS_OP_INTERRUPTIBLE)) if (!(flags & ORANGEFS_OP_INTERRUPTIBLE))
set_signals(&orig_sigset); orangefs_set_signals(&orig_sigset);
BUG_ON(ret != op->downcall.status); BUG_ON(ret != op->downcall.status);
/* retry if operation has not been serviced and if requested */ /* retry if operation has not been serviced and if requested */