On Sat, 18 Apr 2020 08:56:31 -0700 Randy Dunlap <rdunlap@xxxxxxxxxxxxx> wrote: > On 4/17/20 8:36 PM, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > The mm-of-the-moment snapshot 2020-04-17-20-35 has been uploaded to > > > > http://www.ozlabs.org/~akpm/mmotm/ > > > > mmotm-readme.txt says > > > > README for mm-of-the-moment: > > > > http://www.ozlabs.org/~akpm/mmotm/ > > > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > > more than once a week. > > > > You will need quilt to apply these patches to the latest Linus release (5.x > > or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicated in > > http://ozlabs.org/~akpm/mmotm/series > > > > 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 is to > > be applied. > > on x86_64: > > CC fs/squashfs/decompressor_multi_percpu.o > ../fs/squashfs/decompressor_multi_percpu.c:75:5: error: conflicting types for ‘squashfs_decompress’ > 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 <akpm@xxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxx Cc: Adrien Schildknecht <adrien+dev@xxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Daniel Rosenberg <drosen@xxxxxxxxxx> Cc: Guenter Roeck <groeck@xxxxxxxxxxxx> Cc: Philippe Liard <pliard@xxxxxxxxxx> Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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 } } -int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_head **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 = - (struct squashfs_stream __percpu *) msblk->stream; - struct squashfs_stream *stream = get_cpu_ptr(percpu); - int res = msblk->decompressor->decompress(msblk, stream->stream, bh, b, - offset, length, output); + struct squashfs_stream __percpu *percpu; + struct squashfs_stream *stream; + int res; + + percpu = (struct squashfs_stream __percpu *)msblk->stream; + stream = get_cpu_ptr(percpu); + res = msblk->decompressor->decompress(msblk, stream->stream, bio, + offset, length, output); put_cpu_ptr(stream); if (res < 0) _
