From patchwork Thu Aug 11 20:54:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 1058942 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 p7BKt7VZ019386 for ; Thu, 11 Aug 2011 20:55:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753957Ab1HKUym (ORCPT ); Thu, 11 Aug 2011 16:54:42 -0400 Received: from natasha.panasas.com ([67.152.220.90]:35362 "EHLO natasha.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753888Ab1HKUym (ORCPT ); Thu, 11 Aug 2011 16:54:42 -0400 Received: from zenyatta.panasas.com (zenyatta.int.panasas.com [172.17.28.63]) by natasha.panasas.com (8.13.1/8.13.1) with ESMTP id p7BKsaRo001020; Thu, 11 Aug 2011 16:54:36 -0400 Received: from [172.17.132.75] (172.17.132.75) by zenyatta.int.panasas.com (172.17.28.63) with Microsoft SMTP Server (TLS) id 14.1.289.1; Thu, 11 Aug 2011 16:54:30 -0400 Message-ID: <4E444184.9090109@panasas.com> Date: Thu, 11 Aug 2011 13:54:28 -0700 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110707 Thunderbird/5.0 MIME-Version: 1.0 To: Chris Metcalf CC: Trond Myklebust , , , Dean Hildebrand Subject: [PATCH v3] nfs: fix a minor do_div portability issue References: <201108101803.p7AI36eV008484@farm-0023.internal.tilera.com> <4E42FFDC.9090103@panasas.com> <4E43D88A.3060303@tilera.com> <4E441F17.7090504@panasas.com> <201108111938.p7BJc44U012947@farm-0002.internal.tilera.com> In-Reply-To: <201108111938.p7BJc44U012947@farm-0002.internal.tilera.com> 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 20:55:07 +0000 (UTC) On 08/11/2011 12:32 PM, Chris Metcalf wrote: > 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 Thanks Reviewed-by: Boaz Harrosh Just if you don't mind a name change. tmp => stripe_no while at it. --- From: Chris Metcalf Subject: [PATCH v3] nfs: fix a minor do_div portability issue 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 Reviewed-by: Boaz Harrosh --- fs/nfs/nfs4filelayout.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 stripe_no; + u32 rem; offset -= flseg->pattern_offset; - tmp = offset; - do_div(tmp, stripe_width); + stripe_no = 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 stripe_no * flseg->stripe_unit + rem; } /* This function is used by the layout driver to calculate the