From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753070AbbIRWxX (ORCPT ); Fri, 18 Sep 2015 18:53:23 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:29847 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751310AbbIRWxW (ORCPT ); Fri, 18 Sep 2015 18:53:22 -0400 Date: Fri, 18 Sep 2015 16:53:15 -0600 From: Jens Axboe To: CC: Subject: [GIT PULL] Block fixes for 4.3-rc2 Message-ID: <20150918225315.GA13369@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-09-10_07:2015-09-09,2015-09-10,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, This is a bit bigger than it should be, but I could (did) not want to send it off last week due to both wanting extra testing, and expecting a fix for the bounce regression as well. In any case, this pull request contains: - Fix for the blk-merge.c compilation warning on gcc 5.x from me. - A set of back/front SG gap merge fixes, from me and from Sagi. This ensures that we honor SG gapping for integrity payloads as well. - Two small fixes for null_blk from Matias, fixing a leak and a capacity propagation issue. - A blkcg fix from Tejun, fixing a NULL dereference. - A fast clone optimization from Ming, fixing a performance regression since the arbitrarily sized bio's were introduced. - Also from Ming, a regression fix for bouncing IOs. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Jens Axboe (2): block: fix bogus compiler warnings in blk-merge.c block: Check for gaps on front and back merges Matias Bjørling (2): null_blk: fix memory leak on cleanup null_blk: fix wrong capacity when bs is not 512 bytes Ming Lei (2): block: blk-merge: fast-clone bio when splitting rw bios block: fix bounce_end_io Sagi Grimberg (3): block: Refuse request/bio merges with gaps in the integrity payload block: Refuse adding appending a gapped integrity page to a bio block: Copy a user iovec if it includes gaps Tejun Heo (1): block: blkg_destroy_all() should clear q->root_blkg and ->root_rl.blkg block/bio-integrity.c | 5 ++++ block/blk-cgroup.c | 3 +++ block/blk-integrity.c | 3 +++ block/blk-map.c | 26 +++++++++++++++++++-- block/blk-merge.c | 59 +++++++++++++++++++----------------------------- block/bounce.c | 4 +++- drivers/block/null_blk.c | 36 ++++++++++++++--------------- include/linux/blkdev.h | 50 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 129 insertions(+), 57 deletions(-) -- Jens Axboe