From patchwork Fri May 10 12:13:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 242964 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E4A712C009D for ; Fri, 10 May 2013 22:15:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753249Ab3EJMO7 (ORCPT ); Fri, 10 May 2013 08:14:59 -0400 Received: from mga02.intel.com ([134.134.136.20]:7459 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753129Ab3EJMO5 (ORCPT ); Fri, 10 May 2013 08:14:57 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 10 May 2013 05:14:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,647,1363158000"; d="scan'208";a="331927147" Received: from intelbox.fi.intel.com (HELO localhost) ([10.237.72.70]) by fmsmga001.fm.intel.com with ESMTP; 10 May 2013 05:14:05 -0700 From: Imre Deak To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Daniel Vetter , "J. Bruce Fields" , Trond Myklebust , "David S. Miller" , Haggai Eran , Or Gerlitz , Shani Michaeli , Roland Dreier , linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 09/11] net/sunrpc: take msecs_to_jiffies_min into use Date: Fri, 10 May 2013 15:13:27 +0300 Message-Id: <1368188011-23661-9-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368188011-23661-1-git-send-email-imre.deak@intel.com> References: <1368188011-23661-1-git-send-email-imre.deak@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use msecs_to_jiffies_min instead of open-coding the same. Signed-off-by: Imre Deak --- net/sunrpc/xprtrdma/verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 93726560..9cac2c8 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -404,7 +404,7 @@ rpcrdma_create_id(struct rpcrdma_xprt *xprt, goto out; } wait_for_completion_interruptible_timeout(&ia->ri_done, - msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT) + 1); + msecs_to_jiffies_min(RDMA_RESOLVE_TIMEOUT)); rc = ia->ri_async_rc; if (rc) goto out; @@ -417,7 +417,7 @@ rpcrdma_create_id(struct rpcrdma_xprt *xprt, goto out; } wait_for_completion_interruptible_timeout(&ia->ri_done, - msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT) + 1); + msecs_to_jiffies_min(RDMA_RESOLVE_TIMEOUT)); rc = ia->ri_async_rc; if (rc) goto out;