diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2016-01-23 13:17:55 -0500 |
|---|---|---|
| committer |   Mike Marshall <hubcap@omnibond.com> | 2016-01-23 15:20:11 -0500 |
| commit | 727cbfea623b78d46ce8e0f8c931b5189f3fe2e0 (patch) | |
| tree | 43876fa45e56611fd9901f1b943be7438adbc518 /fs/orangefs/orangefs-bufmap.c | |
| parent | orangefs_clean_up_interrupted_operation: call with op->lock held (diff) | |
| download | linux-dev-727cbfea623b78d46ce8e0f8c931b5189f3fe2e0.tar.xz linux-dev-727cbfea623b78d46ce8e0f8c931b5189f3fe2e0.zip | |
orangefs: get rid of MSECS_TO_JIFFIES
All timeouts are in _seconds_, so all calls are of form
MSECS_TO_JIFFIES(n * 1000), which is a convoluted way to
spell n * HZ.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/orangefs-bufmap.c')
| -rw-r--r-- | fs/orangefs/orangefs-bufmap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c index 15baecb8094d..c60019de1fd8 100644 --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -377,13 +377,11 @@ static int wait_for_a_slot(struct slot_args *slargs, int *buffer_index) break; if (!signal_pending(current)) { - int timeout = - MSECS_TO_JIFFIES(1000 * slot_timeout_secs); gossip_debug(GOSSIP_BUFMAP_DEBUG, "[BUFMAP]: waiting %d " "seconds for a slot\n", slot_timeout_secs); - if (!schedule_timeout(timeout)) { + if (!schedule_timeout(slot_timeout_secs * HZ)) { gossip_debug(GOSSIP_BUFMAP_DEBUG, "*** wait_for_a_slot timed out\n"); ret = -ETIMEDOUT; |