diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index b7a6aa44ce3ee5ac135194b16dad8aa8759655a2..d8c436a0aa1b56b6b6566f909e914865527e8137 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -435,9 +435,7 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
 			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",
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index 15baecb8094d6415dc9f6d950ad0eec57b3ae4c8..c60019de1fd8626892382b3b15edd0642b636889 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;
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index f96ec3da6b001b6b56545d92d41cee8ba62d203e..2b72806d0f68fc26beb1be8683ab744776dad0df 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -80,11 +80,6 @@ sizeof(__u64) + sizeof(struct orangefs_upcall_s))
 #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
  *
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index 699ffd8b2a513b5fb4ad82afa95b94ccadcfd3a8..cdbf57bef3ebbac45c11c9ab4e2ab5342c09066e 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -235,8 +235,8 @@ int service_operation(struct orangefs_kernel_op_s *op,
 			 * 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:"
@@ -375,8 +375,7 @@ static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op)
 			 * 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"
@@ -469,8 +468,7 @@ static int wait_for_cancellation_downcall(struct orangefs_kernel_op_s *op)
 			     "%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",