diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-08-16 11:38:14 -0400 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-08-16 11:41:24 -0400 |
| commit | 1d503617884ed43af1c03685e73ce23f155d3fa4 (patch) | |
| tree | e576cd8866c2cec6c5e29a75098d27f27e78e90a /fs/orangefs/waitqueue.c | |
| parent | 889d5f1baca698a4510174cdd6a6596997d0deb4 (diff) | |
| download | lwn-1d503617884ed43af1c03685e73ce23f155d3fa4.tar.gz lwn-1d503617884ed43af1c03685e73ce23f155d3fa4.zip | |
orangefs: rename most remaining global variables
Only op_timeout_secs, slot_timeout_secs, and hash_table_size are left
because they are exposed as module parameters. All other global
variables have the orangefs_ prefix.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Diffstat (limited to 'fs/orangefs/waitqueue.c')
| -rw-r--r-- | fs/orangefs/waitqueue.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c index 31635bc303fe..abcfa3fa9992 100644 --- a/fs/orangefs/waitqueue.c +++ b/fs/orangefs/waitqueue.c @@ -87,9 +87,9 @@ retry_servicing: */ if (!(flags & ORANGEFS_OP_NO_MUTEX)) { if (flags & ORANGEFS_OP_INTERRUPTIBLE) - ret = mutex_lock_interruptible(&request_mutex); + ret = mutex_lock_interruptible(&orangefs_request_mutex); else - ret = mutex_lock_killable(&request_mutex); + ret = mutex_lock_killable(&orangefs_request_mutex); /* * check to see if we were interrupted while waiting for * mutex @@ -129,7 +129,7 @@ retry_servicing: spin_unlock(&orangefs_request_list_lock); if (!(flags & ORANGEFS_OP_NO_MUTEX)) - mutex_unlock(&request_mutex); + mutex_unlock(&orangefs_request_mutex); ret = wait_for_matching_downcall(op, timeout, flags & ORANGEFS_OP_INTERRUPTIBLE); @@ -272,9 +272,9 @@ static void } else if (op_state_in_progress(op)) { /* op must be removed from the in progress htable */ spin_unlock(&op->lock); - spin_lock(&htable_ops_in_progress_lock); + spin_lock(&orangefs_htable_ops_in_progress_lock); list_del_init(&op->list); - spin_unlock(&htable_ops_in_progress_lock); + spin_unlock(&orangefs_htable_ops_in_progress_lock); gossip_debug(GOSSIP_WAIT_DEBUG, "Interrupted: Removed op %p" " from htable_ops_in_progress\n", |