From nobody Fri Sep 12 00:15:37 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2495C4167B for ; Wed, 6 Dec 2023 15:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442481AbjLFPNp (ORCPT ); Wed, 6 Dec 2023 10:13:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442472AbjLFPNn (ORCPT ); Wed, 6 Dec 2023 10:13:43 -0500 Received: from relayaws-01.paragon-software.com (relayaws-01.paragon-software.com [35.157.23.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FBC0B5; Wed, 6 Dec 2023 07:13:49 -0800 (PST) Received: from relayfre-01.paragon-software.com (unknown [172.30.72.12]) by relayaws-01.paragon-software.com (Postfix) with ESMTPS id 216141E1A; Wed, 6 Dec 2023 15:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1701875243; bh=CUZk88fabksVMQIwptkfOhP6XsgOcXbEpcc4odQSDSQ=; h=Date:Subject:From:To:CC:References:In-Reply-To; b=NCK6bfmAVok0RLfrG2qNu60LQBlIyV8PnwhtGpjL8OHnbfVEi3NJ4VX370Q1e5hk3 HOzmdUxENLGFoCwvBzdk7CzHTnC0QkqbXH/Uig2v9kOtjc8kTdItbUuJFx9ZVhn1V6 awSW+hE0eS335PqIP4VtGv0WlMxfI8F7ZdrLM6YU= Received: from dlg2.mail.paragon-software.com (vdlg-exch-02.paragon-software.com [172.30.1.105]) by relayfre-01.paragon-software.com (Postfix) with ESMTPS id 64E4B2117; Wed, 6 Dec 2023 15:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1701875627; bh=CUZk88fabksVMQIwptkfOhP6XsgOcXbEpcc4odQSDSQ=; h=Date:Subject:From:To:CC:References:In-Reply-To; b=cKTfILwvtBLLE19pwq14wyqj1avYe8W/4CiDi8l/6aJTt4VI1IVYevoAo22826ksJ ROfjf2aOvncNloeosyx2+MUuiP2wVYUZC88epJYNhDB5WBuYiKNKTKnqQBeu/gg51w R0UbWXrBWjm1M6WFpRGa90JZRnpvbf+JG4wMctg4= Received: from [172.16.192.129] (192.168.211.144) by vdlg-exch-02.paragon-software.com (172.30.1.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Wed, 6 Dec 2023 18:13:46 +0300 Message-ID: <6e9cc7e7-b29c-4d63-a73c-9aadd1589f18@paragon-software.com> Date: Wed, 6 Dec 2023 18:13:46 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 13/16] fs/ntfs3: ntfs3_forced_shutdown use int instead of bool Content-Language: en-US From: Konstantin Komarovc To: CC: , References: <00fd1558-fda5-421b-be43-7de69e32cb4e@paragon-software.com> In-Reply-To: <00fd1558-fda5-421b-be43-7de69e32cb4e@paragon-software.com> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.211.144] X-ClientProxiedBy: vobn-exch-01.paragon-software.com (172.30.72.13) To vdlg-exch-02.paragon-software.com (172.30.1.105) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Konstantin Komarov --- =C2=A0fs/ntfs3/fsntfs.c=C2=A0 | 3 ++- =C2=A0fs/ntfs3/ntfs_fs.h | 6 +++--- =C2=A0fs/ntfs3/super.c=C2=A0=C2=A0 | 2 +- =C2=A03 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index fbfe21dbb425..350461d8cece 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -853,7 +853,8 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi,=20 int wait) =C2=A0=C2=A0=C2=A0 =C2=A0/* =C2=A0=C2=A0=C2=A0 =C2=A0 * sb can be NULL here. In this case sbi->flags s= hould be 0 too. =C2=A0=C2=A0=C2=A0 =C2=A0 */ -=C2=A0=C2=A0 =C2=A0if (!sb || !(sbi->flags & NTFS_FLAGS_MFTMIRR)) +=C2=A0=C2=A0 =C2=A0if (!sb || !(sbi->flags & NTFS_FLAGS_MFTMIRR) || +=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 unlikely(ntfs3_forced_shutdown(sb))) =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0return; =C2=A0=C2=A0=C2=A0 =C2=A0blocksize =3D sb->s_blocksize; diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h index d40bc7669ae5..7510875efef6 100644 --- a/fs/ntfs3/ntfs_fs.h +++ b/fs/ntfs3/ntfs_fs.h @@ -62,7 +62,7 @@ enum utf16_endian; =C2=A0/* sbi->flags */ =C2=A0#define NTFS_FLAGS_NODISCARD=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A00x= 00000001 =C2=A0/* ntfs in shutdown state. */ -#define NTFS_FLAGS_SHUTDOWN=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A00x00000002 +#define NTFS_FLAGS_SHUTDOWN_BIT=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A00x000= 00002=C2=A0 /* =3D=3D 4*/ =C2=A0/* Set when LogFile is replaying. */ =C2=A0#define NTFS_FLAGS_LOG_REPLAYING=C2=A0=C2=A0 =C2=A00x00000008 =C2=A0/* Set when we changed first MFT's which copy must be updated in=20 $MftMirr. */ @@ -1001,9 +1001,9 @@ static inline struct ntfs_sb_info *ntfs_sb(struct=20 super_block *sb) =C2=A0=C2=A0=C2=A0 =C2=A0return sb->s_fs_info; =C2=A0} -static inline bool ntfs3_forced_shutdown(struct super_block *sb) +static inline int ntfs3_forced_shutdown(struct super_block *sb) =C2=A0{ -=C2=A0=C2=A0 =C2=A0return test_bit(NTFS_FLAGS_SHUTDOWN, &ntfs_sb(sb)->flag= s); +=C2=A0=C2=A0 =C2=A0return test_bit(NTFS_FLAGS_SHUTDOWN_BIT, &ntfs_sb(sb)->= flags); =C2=A0} =C2=A0/* diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index af8521a6ed95..65ef4b57411f 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -719,7 +719,7 @@ static int ntfs_show_options(struct seq_file *m,=20 struct dentry *root) =C2=A0 */ =C2=A0static void ntfs_shutdown(struct super_block *sb) =C2=A0{ -=C2=A0=C2=A0 =C2=A0set_bit(NTFS_FLAGS_SHUTDOWN, &ntfs_sb(sb)->flags); +=C2=A0=C2=A0 =C2=A0set_bit(NTFS_FLAGS_SHUTDOWN_BIT, &ntfs_sb(sb)->flags); =C2=A0} =C2=A0/* --=20 2.34.1