From patchwork Mon Feb 5 23:22:51 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: 10202013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE15F602CA for ; Mon, 5 Feb 2018 23:23:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D57D21FF3E for ; Mon, 5 Feb 2018 23:23:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA1D9288FA; Mon, 5 Feb 2018 23:23:02 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 4E86A288F8 for ; Mon, 5 Feb 2018 23:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbeBEXXB (ORCPT ); Mon, 5 Feb 2018 18:23:01 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:60736 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbeBEXXB (ORCPT ); Mon, 5 Feb 2018 18:23:01 -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 w15NMEHN149204; Mon, 5 Feb 2018 23:22:59 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-2017-10-26; bh=TkxyODSS1qZQr1GQeqsPOPXxBIjOeqJPiQwxUDorq2Y=; b=B7PQ0I0jxu9R4HfgQ0YeVlPuvDyO2GdyDSGi8V0sWkdFl8EZXIsX/vBZ36QnsAC22gP9 o4lCZ9thqfJoEnW3x3/cnjZIntiNYu3ASMbivT6+NoBVq3HGUtste/lPSabe1+dR9Nmb AH5GPnqqQgnSZW9R9I1By8XUjeXMbkUA+Hrv+injD7KOG27rPCubQPZjxrNYY2G2iSdL 2P/sV2mijCIqVoO50rMDY2Zeep1opBwuFrV9fprjICJyV9pP5xEqVX5f+u+FZVLNNFzp k1kjxy35mVIMbk9HiJhluUCqMggqpAQMGsE4+GnkdOM2A5ACrcgDKjslXiFIlHEySLNV 7w== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2fy0uk009n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Feb 2018 23:22:59 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w15NMwYT015371 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 5 Feb 2018 23:22:58 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w15NMvIw018203; Mon, 5 Feb 2018 23:22:57 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 05 Feb 2018 15:22:57 -0800 Subject: [PATCH 5/7] xfs_scrub: reclassify some of the warning messages From: "Darrick J. Wong" To: sandeen@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Mon, 05 Feb 2018 15:22:51 -0800 Message-ID: <151787297178.3743.12195489468667039346.stgit@magnolia> In-Reply-To: <151787293446.3743.11110014829952400444.stgit@magnolia> References: <151787293446.3743.11110014829952400444.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8796 signatures=668662 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=771 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1802050285 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 Some of the warning messages are actually runtime errors in optional components, so turn them into informational messages. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Reviewed-by: Jan Tulak --- scrub/inodes.c | 6 +++--- scrub/phase6.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/scrub/inodes.c b/scrub/inodes.c index 57b773e..744b003 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -157,7 +157,7 @@ xfs_iterate_inodes_range( bulkreq.icount = inogrp.xi_alloccount; error = ioctl(ctx->mnt_fd, XFS_IOC_FSBULKSTAT, &bulkreq); if (error) - str_warn(ctx, descr, "%s", strerror_r(errno, + str_info(ctx, descr, "%s", strerror_r(errno, buf, DESCR_BUFSZ)); xfs_iterate_inodes_range_check(ctx, &inogrp, bstat); @@ -181,8 +181,8 @@ xfs_iterate_inodes_range( } snprintf(idescr, DESCR_BUFSZ, "inode %"PRIu64, (uint64_t)bs->bs_ino); - str_warn(ctx, idescr, "%s", strerror_r(error, - buf, DESCR_BUFSZ)); + str_info(ctx, idescr, +_("Changed too many times during scan; giving up.")); break; case XFS_ITERATE_INODES_ABORT: error = 0; diff --git a/scrub/phase6.c b/scrub/phase6.c index f985950..e255eef 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -188,7 +188,6 @@ xfs_report_verify_inode( void *arg) { char descr[DESCR_BUFSZ]; - char buf[DESCR_BUFSZ]; bool moveon; int fd; int error; @@ -209,7 +208,8 @@ xfs_report_verify_inode( if (error == ESTALE) return error; - str_warn(ctx, descr, "%s", strerror_r(error, buf, DESCR_BUFSZ)); + str_info(ctx, descr, +_("Disappeared during read error reporting.")); return error; }