From patchwork Sat Nov 10 00:45:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10676785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F9A7109C for ; Sat, 10 Nov 2018 00:45:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8ED4F2EA0E for ; Sat, 10 Nov 2018 00:45:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 836DE2EA41; Sat, 10 Nov 2018 00:45:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36C7C2EA0E for ; Sat, 10 Nov 2018 00:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727322AbeKJK2k (ORCPT ); Sat, 10 Nov 2018 05:28:40 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:51318 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728458AbeKJK2k (ORCPT ); Sat, 10 Nov 2018 05:28:40 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id wAA0hl07078099 for ; Sat, 10 Nov 2018 00:45:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=XvgBviXPPhrUHkc9kwW6VppLYANnpa+0Gqo9d5+vN1I=; b=eoJmpA531SLqz9FbQBA6i0mkvo+Fc9JsnrQsOdmc+LjiQL0pZtZJ0QIqHTzGCwc/6vVH 30RXHCZZMXx2HjREvOaL96aWkav/Z1IsEEi83eT3RGPanskJ8c5idtgu0JCq7S4VgszU k3VjkrOuo6VaAaHW/fH+OG4oY9cPBiDI3Q425fIIqfGuisfJ7DXjhwxR4YcBxqitB7f8 QlR/anHD3AuaEEHHoSmi/wpVPLyqa8ICU6HOsUQYyAsXfGyJrMnLpvfv4HdOWNIV5ab6 /nXRQebiqwLj2akJTIIHpcB82xdnBTuXFREaL/gBX77JEwrbmFBK/uuMjGpSU9tNQoL2 +w== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2nh33uhtru-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 10 Nov 2018 00:45:34 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wAA0jXJc019847 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 10 Nov 2018 00:45:33 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wAA0jX4Q023072 for ; Sat, 10 Nov 2018 00:45:33 GMT Received: from localhost (/10.145.179.67) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2018 16:45:33 -0800 Subject: [PATCH 3/6] xfs_repair: skip block reservation when fixing freelist From: "Darrick J. Wong" To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 09 Nov 2018 16:45:33 -0800 Message-ID: <154181073309.3727.6459189318125795042.stgit@magnolia> In-Reply-To: <154181071499.3727.3910572718199592407.stgit@magnolia> References: <154181071499.3727.3910572718199592407.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9072 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811100004 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong AGFL blocks are considered to be part of the fdblocks count, so there's no need to obtain a block reservation when fixing the AGFL as part of repair. Asking for a reservation can cause repair to fail if the superblock claims zero fdblocks because we haven't gotten far enough into phase 5 to have reset the superblock counters. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Henderson Reviewed-by: Eric Sandeen --- repair/rmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repair/rmap.c b/repair/rmap.c index ebb5a3ad..c5a86646 100644 --- a/repair/rmap.c +++ b/repair/rmap.c @@ -1374,8 +1374,7 @@ fix_freelist( args.agno = agno; args.alignment = 1; args.pag = libxfs_perag_get(mp, agno); - error = -libxfs_trans_alloc_rollable(mp, - libxfs_alloc_min_freelist(mp, args.pag), &tp); + error = -libxfs_trans_alloc_rollable(mp, 0, &tp); if (error) do_error(_("failed to fix AGFL on AG %d, error %d\n"), agno, error);