Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337AbdDJMup (ORCPT ); Mon, 10 Apr 2017 08:50:45 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:36633 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbdDJMun (ORCPT ); Mon, 10 Apr 2017 08:50:43 -0400 Subject: Re: [PATCH] btrfs: scrub: use do_div() for 64-by-32 division To: Adam Borowski , Chris Mason , Josef Bacik , David Sterba , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, Icenowy Zheng , Fabio Estevam References: <20170408210737.5456-1-kilobyte@angband.pl> From: "Austin S. Hemmelgarn" Message-ID: <7179b0c7-0951-b5f3-6835-2f005ea743e1@gmail.com> Date: Mon, 10 Apr 2017 08:50:37 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170408210737.5456-1-kilobyte@angband.pl> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1409 Lines: 39 On 2017-04-08 17:07, Adam Borowski wrote: > Unbreaks ARM and possibly other 32-bit architectures. > > Fixes: 7d0ef8b4d: Btrfs: update scrub_parity to use u64 stripe_len > Reported-by: Icenowy Zheng > Signed-off-by: Adam Borowski > --- > You'd probably want to squash this with Liu's commit, to be nice to future > bisects. > > Tested on amd64 where all is fine, and on arm (Odroid-U2) where scrub > sometimes works, but, like most operations, randomly dies with some badness > that doesn't look related: io_schedule, kunmap_high. That badness wasn't > there in 4.11-rc5, needs investigating, but since it's not connected to our > issue at hand, I consider this patch sort-of tested. > > fs/btrfs/scrub.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c > index b6fe1cd08048..95372e3679f3 100644 > --- a/fs/btrfs/scrub.c > +++ b/fs/btrfs/scrub.c > @@ -2407,7 +2407,7 @@ static inline void __scrub_mark_bitmap(struct scrub_parity *sparity, > > start -= sparity->logic_start; > start = div64_u64_rem(start, sparity->stripe_len, &offset); > - offset /= sectorsize; > + do_div(offset, sectorsize); > nsectors = (int)len / sectorsize; > > if (offset + nsectors <= sparity->nsectors) { > Also fixes things on: 32-bit MIPS (eb and el variants) 32-bit SPARC 32-bit PPC You can add my Tested-by if you want.