diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-01-04 15:05:28 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-04 16:21:46 -0500 |
| commit | 7d2214858f137ff5fe20d0fdc2823c12b4b54f46 (patch) | |
| tree | c269ab6ecb76f691dc20623ea0ffac2ba46ff736 /fs/orangefs/waitqueue.c | |
| parent | c146c0b87f7cef247744a649f8c1d794d18bfcb7 (diff) | |
| download | lwn-7d2214858f137ff5fe20d0fdc2823c12b4b54f46.tar.gz lwn-7d2214858f137ff5fe20d0fdc2823c12b4b54f46.zip | |
orangefs: Fix some more global namespace pollution.
This only changes the names of things, so there is no functional change.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/waitqueue.c')
| -rw-r--r-- | fs/orangefs/waitqueue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c index e1415e3882ba..751c3c640a52 100644 --- a/fs/orangefs/waitqueue.c +++ b/fs/orangefs/waitqueue.c @@ -180,7 +180,7 @@ retry_servicing: goto retry_servicing; /* op uses shared memory */ - if (get_bufmap_init() == 0) { + if (orangefs_get_bufmap_init() == 0) { /* * This operation uses the shared memory system AND * the system is not yet ready. This situation occurs @@ -194,7 +194,7 @@ retry_servicing: "Client core in-service status(%d).\n", is_daemon_in_service()); gossip_debug(GOSSIP_WAIT_DEBUG, "bufmap_init:%d.\n", - get_bufmap_init()); + orangefs_get_bufmap_init()); gossip_debug(GOSSIP_WAIT_DEBUG, "operation's status is 0x%0x.\n", op->op_state); @@ -222,13 +222,13 @@ retry_servicing: ret); gossip_debug(GOSSIP_WAIT_DEBUG, "Is shared memory available? (%d).\n", - get_bufmap_init()); + orangefs_get_bufmap_init()); spin_lock_irqsave(&op->lock, irqflags); finish_wait(&orangefs_bufmap_init_waitq, &wait_entry); spin_unlock_irqrestore(&op->lock, irqflags); - if (get_bufmap_init() == 0) { + if (orangefs_get_bufmap_init() == 0) { gossip_err("%s:The shared memory system has not started in %d seconds after the client core restarted. Aborting user's request(%s).\n", __func__, ORANGEFS_BUFMAP_WAIT_TIMEOUT_SECS, |