From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754587AbcLADAm (ORCPT ); Wed, 30 Nov 2016 22:00:42 -0500 Received: from mail-pg0-f45.google.com ([74.125.83.45]:36842 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbcLADAk (ORCPT ); Wed, 30 Nov 2016 22:00:40 -0500 Subject: Re: linux-next: build failure after merge of the block tree To: Stephen Rothwell , David Chinner , xfs@oss.sgi.com References: <20161201135517.273c9a4d@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig From: Jens Axboe Message-ID: Date: Wed, 30 Nov 2016 20:00:36 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161201135517.273c9a4d@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/30/2016 07:55 PM, Stephen Rothwell wrote: > Hi Jens, > > After merging the block tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > fs/iomap.c: In function 'iomap_dio_zero': > fs/iomap.c:725:38: error: 'WRITE_ODIRECT' undeclared (first use in this function) > bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT); > ^ > fs/iomap.c:725:38: note: each undeclared identifier is reported only once for each function it appears in > fs/iomap.c: In function 'iomap_dio_actor': > fs/iomap.c:808:40: error: 'WRITE_ODIRECT' undeclared (first use in this function) > bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_ODIRECT); > ^ > fs/iomap.c: In function 'iomap_dio_rw': > fs/iomap.c:933:9: error: implicit declaration of function 'blk_poll' [-Werror=implicit-function-declaration] > !blk_poll(dio->submit.last_queue, > ^ > > Caused by commits > > 70fd76140a6c ("block,fs: use REQ_* flags directly") > bbd7bb7017d5 ("block: move poll code to blk-mq") > > interacting with commit > > ff6a9292e6f6 ("iomap: implement direct I/O") > > from the xfs tree. > > I love APIs changing :-( It's a necessary evil... This could have been avoided with the XFS tree pulling in the block changes, but that obviously has other implications. Something to watch for when the XFS tree is sent in for the merge window, however. > I have applied the following merge fix patch for today. The fix is correct. -- Jens Axboe