From patchwork Thu Aug 11 19:32:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 1058572 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7BJcT8v024095 for ; Thu, 11 Aug 2011 19:38:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753351Ab1HKTiI (ORCPT ); Thu, 11 Aug 2011 15:38:08 -0400 Received: from 206.83.70.73.ptr.us.xo.net ([206.83.70.73]:40889 "EHLO king.tilera.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328Ab1HKTiG (ORCPT ); Thu, 11 Aug 2011 15:38:06 -0400 Received: from farm-0002.internal.tilera.com ([10.2.0.32]) by king.tilera.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 11 Aug 2011 15:38:04 -0400 Received: (from cmetcalf@localhost) by farm-0002.internal.tilera.com (8.13.8/8.12.11/Submit) id p7BJc44U012947; Thu, 11 Aug 2011 15:38:04 -0400 Message-Id: <201108111938.p7BJc44U012947@farm-0002.internal.tilera.com> From: Chris Metcalf Date: Thu, 11 Aug 2011 15:32:25 -0400 Subject: [PATCH v2] nfs: fix a minor do_div portability issue To: Boaz Harrosh Cc: Trond Myklebust , , , Dean Hildebrand In-Reply-To: <4E441F17.7090504@panasas.com> References: <201108101803.p7AI36eV008484@farm-0023.internal.tilera.com> <4E42FFDC.9090103@panasas.com> <4E43D88A.3060303@tilera.com> <4E441F17.7090504@panasas.com> X-OriginalArrivalTime: 11 Aug 2011 19:38:04.0934 (UTC) FILETIME=[306A3A60:01CC585E] Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 11 Aug 2011 19:38:29 +0000 (UTC) This change modifies filelayout_get_dense_offset() to use the functions in math64.h and thus avoid a 32-bit platform compile error trying to use do_div() on an s64 type. Signed-off-by: Chris Metcalf Cc: Boaz Harrosh --- fs/nfs/nfs4filelayout.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index e8915d4..3ecb14f 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -49,12 +49,13 @@ filelayout_get_dense_offset(struct nfs4_filelayout_segment *flseg, { u32 stripe_width = flseg->stripe_unit * flseg->dsaddr->stripe_count; u64 tmp; + u32 rem; offset -= flseg->pattern_offset; - tmp = offset; - do_div(tmp, stripe_width); + tmp = div_u64(offset, stripe_width); + div_u64_rem(offset, flseg->stripe_unit, &rem); - return tmp * flseg->stripe_unit + do_div(offset, flseg->stripe_unit); + return tmp * flseg->stripe_unit + rem; } /* This function is used by the layout driver to calculate the