From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbbAHS27 (ORCPT ); Thu, 8 Jan 2015 13:28:59 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:59566 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbbAHS25 (ORCPT ); Thu, 8 Jan 2015 13:28:57 -0500 Date: Thu, 8 Jan 2015 13:28:45 -0500 From: Chris Mason To: CC: , Subject: [GIT PULL] Btrfs fixes Message-ID: <20150108182833.GA5005@ret.masoncoding.com> Mail-Followup-To: Chris Mason , torvalds@linux-foundation.org, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-01-08_04:2015-01-07,2015-01-08,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=5.55111512312578e-17 kscore.compositescore=0 circleOfTrustscore=29.4129509548051 compositescore=0.939076664828693 urlsuspect_oldscore=0.939076664828693 suspectscore=1 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=64355 rbsscore=0.939076664828693 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1501080169 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, We have a small queue of btrfs fixes in my for-linus branch: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus None of these are huge, but my commit does fix a regression from 3.18 that could cause lost files during log replay. This also adds Dave Sterba to the list of Btrfs maintainers. It doesn't mean we're doing things differently, but Dave has really been helping with the maintainer workload for years. Chris Mason (2) commits (+9/-0): Btrfs: don't delay inode ref updates during log replay (+8/-0) Btrfs: add more maintainers (+1/-0) Wang Shilong (1) commits (+3/-1): Btrfs: call inode_dec_link_count() on mkdir error path Filipe Manana (1) commits (+10/-3): Btrfs: correctly get tree level in tree_backref_for_extent Josef Bacik (1) commits (+6/-6): Btrfs: abort transaction if we don't find the block group Dan Carpenter (1) commits (+1/-1): Btrfs, scrub: uninitialized variable in scrub_extent_for_parity() Total: (6) commits (+29/-11) MAINTAINERS | 1 + fs/btrfs/backref.c | 13 ++++++++++--- fs/btrfs/delayed-inode.c | 8 ++++++++ fs/btrfs/extent-tree.c | 12 ++++++------ fs/btrfs/inode.c | 4 +++- fs/btrfs/scrub.c | 2 +- 6 files changed, 29 insertions(+), 11 deletions(-)