Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758622Ab3HJM2h (ORCPT ); Sat, 10 Aug 2013 08:28:37 -0400 Received: from dkim1.fusionio.com ([66.114.96.53]:41658 "EHLO dkim1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758537Ab3HJM2f convert rfc822-to-8bit (ORCPT ); Sat, 10 Aug 2013 08:28:35 -0400 X-ASG-Debug-ID: 1376137714-03d6a5458220f0c0001-xx1T2L X-Barracuda-Envelope-From: clmason@fusionio.com Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Linus Torvalds , LKML , Message-ID: <20130810122832.17880.78970@localhost.localdomain> From: Chris Mason User-Agent: alot/0.3.4 Subject: [GIT PULL] Btrfs Date: Sat, 10 Aug 2013 08:28:32 -0400 X-ASG-Orig-Subj: [GIT PULL] Btrfs X-Originating-IP: [10.101.1.160] X-Barracuda-Connect: cas2.int.fusionio.com[10.101.1.41] X-Barracuda-Start-Time: 1376137714 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://10.101.1.180:8000/cgi-mod/mark.cgi X-Barracuda-Bayes: INNOCENT GLOBAL 0.0027 1.0000 -2.0037 X-Barracuda-Spam-Score: -2.00 X-Barracuda-Spam-Status: No, SCORE=-2.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.138123 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1969 Lines: 47 Hi Linus Please pull my for-linus branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus These are assorted fixes, mostly from Josef nailing down xfstests runs. Zach also has a long standing fix for problems with readdir wrapping f_pos (or ctx->pos) These patches were spread out over different bases, so I rebased things on top of rc4 and retested overnight. Josef Bacik (6) commits (+82/-52): Btrfs: check to see if root_list is empty before adding it to dead roots (+5/-5) Btrfs: make sure the backref walker catches all refs to our extent (+14/-11) Btrfs: allow splitting of hole em's when dropping extent cache (+40/-22) Btrfs: release both paths before logging dir/changed extents (+2/-3) Btrfs: fix backref walking when we hit a compressed extent (+15/-8) Btrfs: do not offset physical if we're compressed (+6/-3) Liu Bo (2) commits (+12/-5): Btrfs: fix a bug of snapshot-aware defrag to make it work on partial extents (+12/-4) Btrfs: fix extent buffer leak after backref walking (+0/-1) Zach Brown (1) commits (+25/-8): btrfs: don't loop on large offsets in readdir Jie Liu (1) commits (+0/-3): btrfs: fix file truncation if FALLOC_FL_KEEP_SIZE is specified Total: (10) commits (+119/-68) fs/btrfs/backref.c | 48 ++++++++++++++++++++++---------------- fs/btrfs/ctree.c | 1 - fs/btrfs/extent_io.c | 9 +++++--- fs/btrfs/file.c | 62 ++++++++++++++++++++++++++++++++------------------ fs/btrfs/inode.c | 52 ++++++++++++++++++++++++++++++------------ fs/btrfs/transaction.c | 8 +++---- fs/btrfs/transaction.h | 2 +- fs/btrfs/tree-log.c | 5 ++-- 8 files changed, 119 insertions(+), 68 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/