Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1734857pxb; Thu, 16 Sep 2021 14:19:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5f2cqdxiYDkwY5nsUGk57Ij5WPZHmASQWaXNwbkDBqFlLgFLf4RDkL8LLAHNKTA4GOOh6 X-Received: by 2002:a92:d382:: with SMTP id o2mr5370859ilo.67.1631827171928; Thu, 16 Sep 2021 14:19:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631827171; cv=none; d=google.com; s=arc-20160816; b=dQ7Z97V3fAt0eUTzQBmIapHDrAKol7akUUd8w22V9mvb8q7loupiRPgsAbP5NI2xdw pJJpkZumVfp5bPQaBrGMcAqcDjhnR8s5fyPyEarMFogOVmfKXDxNc2JeV/B4W+r9V0ON x3kdZImHdHzt0/6Li7uXVrD625hWTkpvaCOMish/nEJFB/ArbCRunZPVEdRvLF103KNR HE3PRv3AslOdRKTh2sAGCDQ+QvCEDYeSZRHRup3EtSd1cy0IK9olU3LaIP+0qjQGqY/c +j/5C15XTNnBt3Bt1MgLcY22wAX/gVL0NJzM3WKXAX2n3w3apRgD63+NMuIOI4nugwnm kmNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FbltsKIPpria3F9uZpHZpZ/O73N4aXbqqDOzz7LT9gY=; b=YZTIsOki6s6Ny3xP3EIxV2Ml3t9Uo/pjw8OBxcyFfvRPJfOBPvlyCMvkyT7MwLCE0k kskwKCl//S3N6LBp+tE6VEdpgwLm52h0VGI0x26SAio/SsPf3A87J5kaTVyaoPSkwRIV 6mvzqG1+0Q30yVGg3iQ3Q9twLgeWmhxDwWi5Ok3xMPbwdfq79jrguu7dSQhK+UEzQ/ZT XMUf72Z/tXMQWY/fuwpfXo/PR+X1MFnVyMxgaK3j9+qVtNRgifSTaRKa/8PuXIKERVC7 /Jtx1dbw/cVfTvGlbbkK9urEzCJpHyUOY1pgRzKXtryuIq0MCK1XHi9GGs6VPOiF9uWq PFbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oJ5doReU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f18si3505384iox.32.2021.09.16.14.19.20; Thu, 16 Sep 2021 14:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oJ5doReU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245257AbhIPQkP (ORCPT + 99 others); Thu, 16 Sep 2021 12:40:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:44968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242247AbhIPQdr (ORCPT ); Thu, 16 Sep 2021 12:33:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 716E3613A3; Thu, 16 Sep 2021 16:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809236; bh=v6MgzZEhp0bw1aYurSRe/URdwkX17DL7TLIvsxTY+sM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oJ5doReUTpBVW7jZfYA5FpFrg+A5sDSGwO7GpHYiyomqss/dUZpILw0VLMteMVmjD cYgwjQ3/MhlvgBIgiMe4JfB88I3KgSGPTY/FONRrvpIc8RRhC1a9TfNrzdElLbtmqJ KEJVhBEN/leF+lzRGXztJQTDDBi5+PHzDrm2lq4U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.13 081/380] f2fs: fix wrong checkpoint_changed value in f2fs_remount() Date: Thu, 16 Sep 2021 17:57:18 +0200 Message-Id: <20210916155806.789420955@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu [ Upstream commit 277afbde6ca2b38729683fc17c031b4bc942068d ] In f2fs_remount(), return value of test_opt() is an unsigned int type variable, however when we compare it to a bool type variable, it cause wrong result, fix it. Fixes: 4354994f097d ("f2fs: checkpoint disabling") Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 97e3efe5a020..d61f7fcdc66b 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1966,11 +1966,10 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) bool need_restart_ckpt = false, need_stop_ckpt = false; bool need_restart_flush = false, need_stop_flush = false; bool no_extent_cache = !test_opt(sbi, EXTENT_CACHE); - bool disable_checkpoint = test_opt(sbi, DISABLE_CHECKPOINT); + bool enable_checkpoint = !test_opt(sbi, DISABLE_CHECKPOINT); bool no_io_align = !F2FS_IO_ALIGNED(sbi); bool no_atgc = !test_opt(sbi, ATGC); bool no_compress_cache = !test_opt(sbi, COMPRESS_CACHE); - bool checkpoint_changed; #ifdef CONFIG_QUOTA int i, j; #endif @@ -2015,8 +2014,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) err = parse_options(sb, data, true); if (err) goto restore_opts; - checkpoint_changed = - disable_checkpoint != test_opt(sbi, DISABLE_CHECKPOINT); /* * Previous and new state of filesystem is RO, @@ -2133,7 +2130,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) need_stop_flush = true; } - if (checkpoint_changed) { + if (enable_checkpoint == !!test_opt(sbi, DISABLE_CHECKPOINT)) { if (test_opt(sbi, DISABLE_CHECKPOINT)) { err = f2fs_disable_checkpoint(sbi); if (err) -- 2.30.2