From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C1EFC352BE for ; Sat, 18 Apr 2020 19:47:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 01E8A22209 for ; Sat, 18 Apr 2020 19:47:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="LqL40Krj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01E8A22209 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 62BEF8E0005; Sat, 18 Apr 2020 15:47:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DBF98E0003; Sat, 18 Apr 2020 15:47:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F0518E0005; Sat, 18 Apr 2020 15:47:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0060.hostedemail.com [216.40.44.60]) by kanga.kvack.org (Postfix) with ESMTP id 389458E0003 for ; Sat, 18 Apr 2020 15:47:31 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EEDE9181AEF23 for ; Sat, 18 Apr 2020 19:47:30 +0000 (UTC) X-FDA: 76722010260.13.apple75_2475c6b026557 X-HE-Tag: apple75_2475c6b026557 X-Filterd-Recvd-Size: 5096 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Sat, 18 Apr 2020 19:47:30 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CF8C221BE5; Sat, 18 Apr 2020 19:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587239249; bh=mL2v7gmlY6YkAHHXMOzrKlSQV8Vf0xQE3kzf/miTo1Y=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=LqL40KrjBv/tMd0dgpCqOmCDnDZBp0rKnLFw63kiV1onm9tEYBBmkse2SLh3zcA/H C8l1WiDNa0QFzbRYAR6x4UoMjwnq1rhaWauLPdtFQmT7XvNfszS0WdZ3RwTGJ9XGzz wClFtb3qbPzT23JrT4XCmyqOuDg4OLZ/nAP8uqD8= Date: Sat, 18 Apr 2020 12:47:28 -0700 From: Andrew Morton To: Randy Dunlap Cc: broonie@kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-next@vger.kernel.org, mhocko@suse.cz, mm-commits@vger.kernel.org, sfr@canb.auug.org.au, Phillip Lougher , squashfs-devel@lists.sourceforge.net, Philippe Liard Subject: Re: mmotm 2020-04-17-20-35 uploaded (squashfs) Message-Id: <20200418124728.51632dbebc8b5dbc864cc34f@linux-foundation.org> In-Reply-To: <319997c2-5fc8-f889-2ea3-d913308a7c1f@infradead.org> References: <20200418033629.oozqt8YrL%akpm@linux-foundation.org> <319997c2-5fc8-f889-2ea3-d913308a7c1f@infradead.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Sat, 18 Apr 2020 08:56:31 -0700 Randy Dunlap w= rote: > On 4/17/20 8:36 PM, akpm@linux-foundation.org wrote: > > The mm-of-the-moment snapshot 2020-04-17-20-35 has been uploaded to > >=20 > > http://www.ozlabs.org/~akpm/mmotm/ > >=20 > > mmotm-readme.txt says > >=20 > > README for mm-of-the-moment: > >=20 > > http://www.ozlabs.org/~akpm/mmotm/ > >=20 > > This is a snapshot of my -mm patch queue. Uploaded at random hopeful= ly > > more than once a week. > >=20 > > You will need quilt to apply these patches to the latest Linus releas= e (5.x > > or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicat= ed in > > http://ozlabs.org/~akpm/mmotm/series > >=20 > > The file broken-out.tar.gz contains two datestamp files: .DATE and > > .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-= ss, > > followed by the base kernel version against which this patch series i= s to > > be applied. >=20 > on x86_64: >=20 > CC fs/squashfs/decompressor_multi_percpu.o > ../fs/squashfs/decompressor_multi_percpu.c:75:5: error: conflicting typ= es for =E2=80=98squashfs_decompress=E2=80=99 > int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_= head **bh, > ^~~~~~~~~~~~~~~~~~~ Thanks. Seems that file was missed. Also, this code jumps through horrifying hoops in order to initialize locals at their definition site. But the code looks so much better if we Just Don't Do That! From: Andrew Morton Subject: squashfs-migrate-from-ll_rw_block-usage-to-bio-fix fix build error reported by Randy Link: http://lkml.kernel.org/r/319997c2-5fc8-f889-2ea3-d913308a7c1f@infra= dead.org Cc: Adrien Schildknecht Cc: Christoph Hellwig Cc: Daniel Rosenberg Cc: Guenter Roeck Cc: Philippe Liard Cc: Phillip Lougher Cc: Randy Dunlap Signed-off-by: Andrew Morton --- fs/squashfs/decompressor_multi_percpu.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) --- a/fs/squashfs/decompressor_multi_percpu.c~squashfs-migrate-from-ll_rw= _block-usage-to-bio-fix +++ a/fs/squashfs/decompressor_multi_percpu.c @@ -72,14 +72,17 @@ void squashfs_decompressor_destroy(struc } } =20 -int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_he= ad **bh, - int b, int offset, int length, struct squashfs_page_actor *output) +int squashfs_decompress(struct squashfs_sb_info *msblk, struct bio *bio, + int offset, int length, struct squashfs_page_actor *output) { - struct squashfs_stream __percpu *percpu =3D - (struct squashfs_stream __percpu *) msblk->stream; - struct squashfs_stream *stream =3D get_cpu_ptr(percpu); - int res =3D msblk->decompressor->decompress(msblk, stream->stream, bh, = b, - offset, length, output); + struct squashfs_stream __percpu *percpu; + struct squashfs_stream *stream; + int res; + + percpu =3D (struct squashfs_stream __percpu *)msblk->stream; + stream =3D get_cpu_ptr(percpu); + res =3D msblk->decompressor->decompress(msblk, stream->stream, bio, + offset, length, output); put_cpu_ptr(stream); =20 if (res < 0) _