From patchwork Mon Feb 9 20:03:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 5803241 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 07659BF440 for ; Mon, 9 Feb 2015 20:04:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41BE62011D for ; Mon, 9 Feb 2015 20:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BCF32011B for ; Mon, 9 Feb 2015 20:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932445AbbBIUEY (ORCPT ); Mon, 9 Feb 2015 15:04:24 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:58694 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760761AbbBIUDg (ORCPT ); Mon, 9 Feb 2015 15:03:36 -0500 Received: from pps.filterd (m0004348 [127.0.0.1]) by m0004348.ppops.net (8.14.5/8.14.5) with SMTP id t19JxJug017642; Mon, 9 Feb 2015 12:03:33 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wit.ai; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=mx2; bh=c3CwYhNuyg0X2KiW130LGEVX+UCXHcwAtcF0k9xpcbc=; b=S0VqE0okhkdKptN/WJKkbXs08QJFR8OUMmZYqt7KMqnzh7SXrrO7P18ZtBCRw+HqUpW7 5QFqwNdsLXqbf5wGi6sBlVWQV81BBAnC28W9NGUUi+VL+l67RdO1kwD9BAOxTdOx3j/p hLYI6bGgMkZew3kFm0O7Oh4FS+ESsWQ8ceYSCLi+LNYLG2jhk8f29NL3cO8MHdagPuI4 RD7HgCAX0RRe0GIF+EE0JG3pOdpxU9TjEPvRAkctIle0C4Y1JziSes9z1yjq3o1xFYsW ICF2UsOyjmXAN6dkai8iQnBL1GWb868jd9dzQ37Ebk6LkbRKF8q5q22aaWOqB+GWZE2X wA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=c3CwYhNuyg0X2KiW130LGEVX+UCXHcwAtcF0k9xpcbc=; b=PPU+sYiAsNAdV4KIUtbswEcsAiryduyQfZBJsk5Nz3m/nntYgy/aMbBxoCbxYs20rwPV c0jI2ZakW8EvYDAmGRyvT8AnY3E6pRQCvUIjjFfArzmbcOPZ6EBgq6WYXRwyNg/Tl8TH 1RugvOkjOAz8xMHBrnJD1RN+wccGvoiX9tA= Received: from mail.thefacebook.com ([199.201.64.23]) by m0004348.ppops.net with ESMTP id 1sf33hr238-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Mon, 09 Feb 2015 12:03:33 -0800 Received: from localhost (192.168.57.29) by mail.thefacebook.com (192.168.16.19) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 9 Feb 2015 12:03:32 -0800 From: Josef Bacik To: , Subject: [PATCH 05/16] Btrfs-progs: don't try to repair reloc roots Date: Mon, 9 Feb 2015 15:03:08 -0500 Message-ID: <1423512199-16552-6-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1423512199-16552-1-git-send-email-jbacik@fb.com> References: <1423512199-16552-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 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-02-09_02:2015-02-09, 2015-02-08, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=0 kscore.compositescore=0 circleOfTrustscore=2.87009407511322 compositescore=0.980601274849849 urlsuspect_oldscore=0.980601274849849 suspectscore=0 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.980601274849849 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-1502090196 X-FB-Internal: deliver Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have logic to fix the root locations for roots in response to a corruption bug we had earlier. However this work doesn't apply to reloc roots and can screw things up worse, so make sure we skip any reloc roots that we find. Thanks, Signed-off-by: Josef Bacik --- cmds-check.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmds-check.c b/cmds-check.c index e74fa0f..2b08c64 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -8886,6 +8886,8 @@ again: if (found_key.type != BTRFS_ROOT_ITEM_KEY) goto next; + if (found_key.objectid == BTRFS_TREE_RELOC_OBJECTID) + goto next; ret = maybe_repair_root_item(info, path, &found_key, trans ? 0 : 1);