From patchwork Thu Mar 15 17:45:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Tulak X-Patchwork-Id: 10285415 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 EBBB2602C2 for ; Thu, 15 Mar 2018 17:45:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D831D28B82 for ; Thu, 15 Mar 2018 17:45:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CABE328BB5; Thu, 15 Mar 2018 17:45:28 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 49A5928B82 for ; Thu, 15 Mar 2018 17:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776AbeCORp1 (ORCPT ); Thu, 15 Mar 2018 13:45:27 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49514 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751711AbeCORp1 (ORCPT ); Thu, 15 Mar 2018 13:45:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE8C64195F06 for ; Thu, 15 Mar 2018 17:45:26 +0000 (UTC) Received: from honza-mbp.redhat.com (ovpn-204-71.brq.redhat.com [10.40.204.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31863C1FB6; Thu, 15 Mar 2018 17:45:26 +0000 (UTC) From: Jan Tulak To: linux-xfs@vger.kernel.org Cc: Jan Tulak Subject: [PATCH 2/2 v1] fsck.xfs: allow forced repairs using xfs_repair Date: Thu, 15 Mar 2018 18:45:21 +0100 Message-Id: <20180315174521.33897-2-jtulak@redhat.com> In-Reply-To: <20180315174521.33897-1-jtulak@redhat.com> References: <20180305150546.32191-1-jtulak@redhat.com> <20180315174521.33897-1-jtulak@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 15 Mar 2018 17:45:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 15 Mar 2018 17:45:26 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jtulak@redhat.com' RCPT:'' 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 The fsck.xfs script did nothing, because xfs doesn't need a fsck to be run on every unclean shutdown. However, sometimes it may happen that the root filesystem really requires the usage of xfs_repair and then it is a hassle. This patch makes the situation a bit easier by detecting forced checks (/forcefsck or fsck.mode=force), so user can require the repair, without the repair being run all the time. Signed-off-by: Jan Tulak --- Changelog: v1: - test for xfs_repair binary - run only in non-interactive session - translate xfs_repair return codes to fsck ones - run only if the filesystem is not mounted - add manpage update --- fsck/xfs_fsck.sh | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++-- man/man8/fsck.xfs.8 | 12 +++++++++- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/fsck/xfs_fsck.sh b/fsck/xfs_fsck.sh index e52969e4..92f246cf 100755 --- a/fsck/xfs_fsck.sh +++ b/fsck/xfs_fsck.sh @@ -3,11 +3,42 @@ # Copyright (c) 2006 Silicon Graphics, Inc. All Rights Reserved. # +NAME=$0 + +# get the right return code for fsck +function repair2fsck_code() { + case $1 in + 0) return 0 # everything is ok + ;; + 1) echo "$NAME error: xfs_repair could not fix the filesystem." 1>&2 + return 4 # errors left uncorrected + ;; + 2) echo "$NAME error: The filesystem to be checked must not be mounted." 1>&2 + return 4 # it should not me mounted during boot, something is wrong + ;; + 3) return 1 # The fs has been fixed + ;; + *) echo "$NAME error: An unknown return code from xfs_repair '$1'" 1>&2 + return 4 # something went wrong with xfs_repair + esac +} + +function ensure_not_mounted() { + local dev=$1 + mounted=`grep -c "^$dev " /proc/mounts` + if [ $mounted -ne 0 ]; then + echo "$NAME error: The filesystem to be checked must not be mounted." 1>&2 + exit 4 + fi +} + AUTO=false -while getopts ":aApy" c +FORCE=false +while getopts ":aApyf" c do case $c in a|A|p|y) AUTO=true;; + f) FORCE=true;; esac done eval DEV=\${$#} @@ -15,10 +46,41 @@ if [ ! -e $DEV ]; then echo "$0: $DEV does not exist" exit 8 fi + +# The flag -f is added by systemd/init scripts when /forcefsck file is present +# or fsck.mode=force is used during boot; an unclean shutdown won't trigger +# this check, user has to explicitly require a forced fsck. +# But first of all, test if it is a non-interactive session. Use multiple +# methods to capture most of the cases: +# The case for *i* and -n "$PS1" are commonly suggested in bash manual +# and the -t 0 test checks stdin +case $- in + *i*) FORCE=false ;; +esac +if [ -n "$PS1" -o -t 0 ]; then + FORCE=false +fi + +if $FORCE; then + if [ -f /sbin/xfs_repair ]; then + BIN="/sbin/xfs_repair" + elif [ -f /usr/sbin/xfs_repair ]; then + BIN="/usr/sbin/xfs_repair" + else + echo "$NAME error: xfs_repair was not found!" 1>&2 + exit 4 + fi + + ensure_not_mounted $DEV + + $BIN -e $DEV + repair2fsck_code $? + exit $? +fi + if $AUTO; then echo "$0: XFS file system." else echo "If you wish to check the consistency of an XFS filesystem or" echo "repair a damaged filesystem, see xfs_repair(8)." fi -exit 0 diff --git a/man/man8/fsck.xfs.8 b/man/man8/fsck.xfs.8 index ace7252d..3eb3ad7f 100644 --- a/man/man8/fsck.xfs.8 +++ b/man/man8/fsck.xfs.8 @@ -1,6 +1,6 @@ .TH fsck.xfs 8 .SH NAME -fsck.xfs \- do nothing, successfully +fsck.xfs \- do nothing, successfuly .SH SYNOPSIS .B fsck.xfs [ @@ -21,6 +21,16 @@ If you wish to check the consistency of an XFS filesystem, or repair a damaged or corrupt XFS filesystem, see .BR xfs_repair (8). +.PP +However, it may happen that a forced repair is required and in makes sense to start +.BR xfs_repair (8) +on startup (either using /forcefsck file or fsck.mode=force kernel option). In this case +.B fsck.xfs +run +.B xfs_repair +for the user. But if run outside of boot environment or without the +.B -f +option, it does nothing. . .SH FILES .IR /etc/fstab .