From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54829C10F14 for ; Thu, 3 Oct 2019 17:43:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FABB20862 for ; Thu, 3 Oct 2019 17:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570124606; bh=OJ9mnMI2XDyTOpfADbcnGjHtFmYjNXnO5Y+Tmshjd0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qU8o85jgIvwvD9No9qxwn1qDG1I9fLHW8zGReBtcpxgBefORGDITrUPoAua2Hya4A npkepdQrHTQJFwFu8Q9wufMFlbPtz/iOxjRZn1QzqZMEe660lB08JkVlTaCwkhMQ6+ rzICpJo6J1EAfDkP7mSaWi4AweXdU+b7vS6WNB0c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730542AbfJCP4R (ORCPT ); Thu, 3 Oct 2019 11:56:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:37918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730488AbfJCP4J (ORCPT ); Thu, 3 Oct 2019 11:56:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 13E56222BE; Thu, 3 Oct 2019 15:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118168; bh=OJ9mnMI2XDyTOpfADbcnGjHtFmYjNXnO5Y+Tmshjd0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1pZq3yVz4QgiV+LnTNc4Jhe1++oF6DjdgNQAfHyYfVMKfnEFPcnwYj+rXxX7abkHC NF24ITnUzt3zRsF4z2Op0zJbWJVddQutvNkXECcuAoe18QgQ7bSZbyRIK7t7NGe38i NHGgRlRbND7vtZyiw+kiXfzTiFtLdixN/Tj+d7bY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Surbhi Palande , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.4 15/99] f2fs: check all the data segments against all node ones Date: Thu, 3 Oct 2019 17:52:38 +0200 Message-Id: <20191003154301.504787967@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154252.297991283@linuxfoundation.org> References: <20191003154252.297991283@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Surbhi Palande [ Upstream commit 1166c1f2f69117ad254189ca781287afa6e550b6 ] As a part of the sanity checking while mounting, distinct segment number assignment to data and node segments is verified. Fixing a small bug in this verification between node and data segments. We need to check all the data segments with all the node segments. Fixes: 042be0f849e5f ("f2fs: fix to do sanity check with current segment number") Signed-off-by: Surbhi Palande Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index bd0dfaecfac3b..aa07c01dc036c 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1211,11 +1211,11 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) } } for (i = 0; i < NR_CURSEG_NODE_TYPE; i++) { - for (j = i; j < NR_CURSEG_DATA_TYPE; j++) { + for (j = 0; j < NR_CURSEG_DATA_TYPE; j++) { if (le32_to_cpu(ckpt->cur_node_segno[i]) == le32_to_cpu(ckpt->cur_data_segno[j])) { f2fs_msg(sbi->sb, KERN_ERR, - "Data segment (%u) and Data segment (%u)" + "Node segment (%u) and Data segment (%u)" " has the same segno: %u", i, j, le32_to_cpu(ckpt->cur_node_segno[i])); return 1; -- 2.20.1