Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272AbbFZPUO (ORCPT ); Fri, 26 Jun 2015 11:20:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49522 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752754AbbFZPUG (ORCPT ); Fri, 26 Jun 2015 11:20:06 -0400 Date: Fri, 26 Jun 2015 11:20:04 -0400 From: Mike Snitzer To: Linus Torvalds , Junichi Nomura Cc: "dm-devel@redhat.com" , Christoph Hellwig , "linux-kernel@vger.kernel.org" , Jens Axboe Subject: [git pull] device mapper fixes for 4.2-rc1 Message-ID: <20150626152004.GA62003@redhat.com> References: <20150625143716.GA13739@kernel.dk> <20150626061510.GA15036@xzibit.linux.bs1.fc.nec.co.jp> <20150626080533.GA16471@xzibit.linux.bs1.fc.nec.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150626080533.GA16471@xzibit.linux.bs1.fc.nec.co.jp> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3111 Lines: 72 On Fri, Jun 26 2015 at 4:05P -0400, Junichi Nomura wrote: > 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. That is more than I'd care to put on Linus at this point. I've prepared a DM pull request that fixes things up. Apologies for not pressing this request-based DM partial completion issue further, it was an oversight on my part. We'll have to get it fixed up properly and revisit for a future release. Linus, The following changes since commit e262f34741522e0d821642e5449c6eeb512723fc: dm stats: add support for request-based DM devices (2015-06-17 12:40:41 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm tags/dm-4.2-fixes for you to fetch changes up to b5451e456840af027b794afc2c7c84c2a17f569b: dm cache policy smq: fix "default" version to be 1.4.0 (2015-06-26 10:14:28 -0400) ---------------------------------------------------------------- - Revert block and DM core changes that removed request-based DM's ability to handle partial request completions -- otherwise with the current SCSI LLDs these changes could lead to silent data corruption. - Fix two DM version bumps that were missing from the initial 4.2 DM pull request (enabled userspace lvm2 to know certain changes have been made). ---------------------------------------------------------------- Mike Snitzer (4): Revert "dm: do not allocate any mempools for blk-mq request-based DM" Revert "block, dm: don't copy bios for request clones" dm: bump the ioctl version to 4.32.0 dm cache policy smq: fix "default" version to be 1.4.0 block/blk-core.c | 94 +++++++++++++++-- drivers/md/dm-cache-policy-smq.c | 2 +- drivers/md/dm-table.c | 29 ++---- drivers/md/dm.c | 220 +++++++++++++++++++++++++++------------ drivers/md/dm.h | 5 +- include/linux/blk_types.h | 2 - include/linux/blkdev.h | 6 +- include/uapi/linux/dm-ioctl.h | 4 +- 8 files changed, 256 insertions(+), 106 deletions(-) -- 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/