From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932268AbbHXEQN (ORCPT ); Mon, 24 Aug 2015 00:16:13 -0400 Received: from ozlabs.org ([103.22.144.67]:52566 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932088AbbHXEQJ (ORCPT ); Mon, 24 Aug 2015 00:16:09 -0400 Date: Mon, 24 Aug 2015 14:16:07 +1000 From: Stephen Rothwell To: Jens Axboe , Chris Mason Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet Subject: linux-next: manual merge of the block tree with the btrfs tree Message-ID: <20150824141607.5644d08c@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, Today's linux-next merge of the block tree got a conflict in: fs/btrfs/inode.c between commit: da2f0f74cf7d ("Btrfs: add support for blkio controllers") from the btrfs tree and commit: b54ffb73cadc ("block: remove bio_get_nr_vecs()") from the block tree. I fixed it up (following Chris's example merge - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc fs/btrfs/inode.c index bda3c41dc9d5,f924d9a62700..000000000000 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@@ -7986,12 -7958,7 +7987,11 @@@ out static struct bio *btrfs_dio_bio_alloc(struct block_device *bdev, u64 first_sector, gfp_t gfp_flags) { - int nr_vecs = bio_get_nr_vecs(bdev); - return btrfs_bio_alloc(bdev, first_sector, BIO_MAX_PAGES, gfp_flags); + struct bio *bio; - bio = btrfs_bio_alloc(bdev, first_sector, nr_vecs, gfp_flags); ++ bio = btrfs_bio_alloc(bdev, first_sector, BIO_MAX_PAGES, gfp_flags); + if (bio) + bio_associate_current(bio); + return bio; } static inline int btrfs_lookup_and_bind_dio_csum(struct btrfs_root *root,