spin_unlock(&op->lock);
if (!signal_pending(current)) {
- int timeout =
- MSECS_TO_JIFFIES(1000 *
- op_timeout_secs);
+ int timeout = op_timeout_secs * HZ;
if (!schedule_timeout(timeout)) {
gossip_debug(GOSSIP_DEV_DEBUG,
"%s: timed out.\n",
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;
#define MAX_DEV_REQ_DOWNSIZE (2 * sizeof(__s32) + \
sizeof(__u64) + sizeof(struct orangefs_downcall_s))
-/* borrowed from irda.h */
-#ifndef MSECS_TO_JIFFIES
-#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)
-#endif
-
/*
* valid orangefs kernel operation states
*
* Wait for orangefs_bufmap_initialize() to wake me up
* within the allotted time.
*/
- ret = schedule_timeout(MSECS_TO_JIFFIES
- (1000 * ORANGEFS_BUFMAP_WAIT_TIMEOUT_SECS));
+ ret = schedule_timeout(
+ ORANGEFS_BUFMAP_WAIT_TIMEOUT_SECS * HZ);
gossip_debug(GOSSIP_WAIT_DEBUG,
"Value returned from schedule_timeout:"
* subsequent attempts, we retry exactly once
* with timeouts
*/
- if (!schedule_timeout(MSECS_TO_JIFFIES
- (1000 * op_timeout_secs))) {
+ if (!schedule_timeout(op_timeout_secs * HZ)) {
gossip_debug(GOSSIP_WAIT_DEBUG,
"*** %s:"
" operation timed out (tag"
"%s:About to call schedule_timeout.\n",
__func__);
spin_unlock(&op->lock);
- ret =
- schedule_timeout(MSECS_TO_JIFFIES(1000 * op_timeout_secs));
+ ret = schedule_timeout(op_timeout_secs * HZ);
gossip_debug(GOSSIP_WAIT_DEBUG,
"%s:Value returned from schedule_timeout(%d).\n",