From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753877AbbGQTiQ (ORCPT ); Fri, 17 Jul 2015 15:38:16 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:6442 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbbGQTiP (ORCPT ); Fri, 17 Jul 2015 15:38:15 -0400 Date: Fri, 17 Jul 2015 15:38:10 -0400 From: Chris Mason To: Linus Torvalds , "linux-kernel@vger.kernel.org" , btrfs Subject: [GIT PULL] Btrfs Message-ID: <20150717193810.GC8274@ret.masoncoding.com> Mail-Followup-To: Chris Mason , Linus Torvalds , "linux-kernel@vger.kernel.org" , btrfs MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.23.1 (2014-03-12) X-Originating-IP: [192.168.52.123] 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-07-17_10:2015-07-17,2015-07-17,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, We have some fixes in my for-linus-4.2 branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus-4.2 These are all from Filipe, and cover a few problems we've had reported on the list recently (along with ones he found on his own). Filipe Manana (5) commits (+34/-6): Btrfs: fix shrinking truncate when the no_holes feature is enabled (+2/-3) Btrfs: fix file corruption after cloning inline extents (+14/-0) Btrfs: fix list transaction->pending_ordered corruption (+2/-2) Btrfs: fix order by which delayed references are run (+13/-0) Btrfs: fix memory leak in the extent_same ioctl (+3/-1) Total: (5) commits (+34/-6) fs/btrfs/extent-tree.c | 13 +++++++++++++ fs/btrfs/inode.c | 5 ++--- fs/btrfs/ioctl.c | 18 +++++++++++++++++- fs/btrfs/transaction.c | 4 ++-- 4 files changed, 34 insertions(+), 6 deletions(-)