Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbbFZIHS (ORCPT ); Fri, 26 Jun 2015 04:07:18 -0400 Received: from TYO202.gate.nec.co.jp ([210.143.35.52]:53490 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751546AbbFZIHG convert rfc822-to-8bit (ORCPT ); Fri, 26 Jun 2015 04:07:06 -0400 X-Greylist: delayed 6585 seconds by postgrey-1.27 at vger.kernel.org; Fri, 26 Jun 2015 04:07:06 EDT From: Junichi Nomura To: Linus Torvalds CC: "dm-devel@redhat.com" , Christoph Hellwig , "linux-kernel@vger.kernel.org" , Mike Snitzer , Jens Axboe Subject: Re: [GIT PULL] Core block IO bits for 4.2 Thread-Topic: [GIT PULL] Core block IO bits for 4.2 Thread-Index: AQHQr1SM6CE+M9ksEUC6yDrFuS3iz529uWGAgAAHPQCAABeZgA== Date: Fri, 26 Jun 2015 08:05:35 +0000 Message-ID: <20150626080533.GA16471@xzibit.linux.bs1.fc.nec.co.jp> References: <20150625143716.GA13739@kernel.dk> <20150626061510.GA15036@xzibit.linux.bs1.fc.nec.co.jp> In-Reply-To: Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.34.125.85] Content-Type: text/plain; charset="iso-2022-jp" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1946 Lines: 49 On 06/26/15 15:41, Linus Torvalds wrote: > On Jun 25, 2015 23:17, "Junichi Nomura" > wrote: >> On 06/25/15 23:37, Jens Axboe wrote: >> > block, dm: don't copy bios for request clones >> >> this change should not be pushed to mainline yet. > > Hmm. I merged all of Jens' pull requests today, so it's now in my tree. What do? Then I think following 3 commits should be reverted. 2d76fff dm: cleanup methods that requeue requests cbc4e3c dm: do not allocate any mempools for blk-mq request-based DM 5f1b670 block, dm: don't copy bios for request clones Reverting 5f1b670 involves conflicts in drvers/md/dm.c for these 2 hunks due to diff contexts difference. It's ok to revert those changes ignoring the contexts. @@ -1089,8 +1038,6 @@ static void free_rq_clone(struct request *clone, bool must_be_mapped) WARN_ON_ONCE(must_be_mapped && !clone->q); - blk_rq_unprep_clone(clone); - if (md->type == DM_TYPE_MQ_REQUEST_BASED) /* stacked on blk-mq queue(s) */ tio->ti->type->release_clone_rq(clone); @@ -1973,11 +1889,7 @@ static int map_request(struct dm_rq_target_io *tio, struct request *rq, } if (IS_ERR(clone)) return DM_MAPIO_REQUEUE; - if (setup_clone(clone, rq, tio, GFP_ATOMIC)) { - /* -ENOMEM */ - ti->type->release_clone_rq(clone); - return DM_MAPIO_REQUEUE; - } + setup_clone(clone, rq, tio); } switch (r) { -- Jun'ichi Nomura, NEC Corporation-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/