From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754858AbaBDR6W (ORCPT ); Tue, 4 Feb 2014 12:58:22 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:32835 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753542AbaBDR6T (ORCPT ); Tue, 4 Feb 2014 12:58:19 -0500 Message-ID: <52F12A66.3000707@fb.com> Date: Tue, 4 Feb 2014 12:59:02 -0500 From: Chris Mason User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Linus Torvalds , , Subject: [GIT PULL] Btrfs Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.16.4] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.87,1.0.14,0.0.0000 definitions=2014-02-04_06:2014-02-04,2014-02-04,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1305240000 definitions=main-1402040087 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Please pull my for-linus: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus Filipe is fixing compile and boot problems with our crc32c rework, and Josef has disabled snapshot aware defrag for now. As the number of snapshots increases, we're hitting OOM. For the short term we're disabling things until a bigger fix is ready. Filipe David Borba Manana (2) commits (+7/-7): Btrfs: use btrfs_crc32c everywhere instead of libcrc32c (+6/-6) Btrfs: use late_initcall instead of module_init (+1/-1) Josef Bacik (1) commits (+1/-1): Btrfs: disable snapshot aware defrag for now Total: (3) commits (+8/-8) fs/btrfs/check-integrity.c | 4 ++-- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/send.c | 4 ++-- fs/btrfs/super.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)