From patchwork Sun Feb 25 06:36:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 205994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1458036dyb; Sat, 24 Feb 2024 22:36:51 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU0/5BnxLgy5gjN9eNAXbekCSGCzkhqFq0zsYQngmj1QrLaUwhDPe2rCQFDu0qNTNEEnD0JXhY1PO+p1J5Rrbx4t088RA== X-Google-Smtp-Source: AGHT+IHM3HBqifOhW2aRjnnk+VyE6RSKYg9nRZotHWf0ErwfPVTAlQS1Bj5Jw3hmHl3TSn/tNWM3 X-Received: by 2002:a17:906:7d86:b0:a3c:36ae:6c96 with SMTP id v6-20020a1709067d8600b00a3c36ae6c96mr2298179ejo.42.1708843011438; Sat, 24 Feb 2024 22:36:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708843011; cv=pass; d=google.com; s=arc-20160816; b=FiGNZrQDIuf2lhVCflFoWmmu3KMnEzQa+lJvxW82im6OGIXEwGHXxtiwkfNyIlJkp7 S7hbLvUC6vyuGgH0m9MCaBoeVyLZr3OZ7wOxMiKyC2OY2YRm3JDyVbKpVX6VXTguVkud 4+oz1hrUIZqgTnE44ioaARdNUTLMYhZsQlufMXhS+mjs2DDA1atk7TdD9vdxM+rwR5Vm 6NTtImlqqklnoivpmZrlVuEN2zY/gIsdHlhsjOO7F2QB8rfUJNXjhcacLi1h4wPkXx1N zOReKTxuSPG7TMsSsHR8THuaGIiNyjvboUr/40JmQCm0emmZ4EAgNCivQfuW686Qqhvs Wqkg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=GOuuxwqoIZC4qW+Ex9IXCfTLbQ9gLlWTmUFnBmd538Y=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=uYG45rzTYIl7WAGzIy5wJoXCpJBigUbvM0zXl2D5NuxPX3YHkxWgVrjmVFZKVJGA8E ob8UcVZC6Duknw1z3tNxM89WWFxhiTkp9kNxRZrVKTBpsT1oDw/esuRS9GhJQYZkjq66 7nHWP71pSA+JUJfntOKRBEimUCQKVchywnSCT0DhwIO8uCPwVfimP7mFjrFAZ2ZG4XBF xEmDfhDG635m7rCDMtyjYVyemEmnwP9hMQqrp8mEE4/hAQviiZTLI2qYr5K2unATdKIU jL9AptD3tLY4PyEQV6AI52FR6bPyARYKIbhhyEdHGDgb6EXMG3hrNt6FPRgc67jSa3yh 0RXQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aw9EbUxr; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79992-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79992-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id x19-20020a170906711300b00a42ef508a59si976765ejj.82.2024.02.24.22.36.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 22:36:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79992-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aw9EbUxr; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79992-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79992-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 11FD71F2191E for ; Sun, 25 Feb 2024 06:36:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DDDC6DDB7; Sun, 25 Feb 2024 06:36:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aw9EbUxr" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B78028F5 for ; Sun, 25 Feb 2024 06:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708842994; cv=none; b=Q0x3RBxlSdra5++T7i1S/UR8zP3Zr8V3tlNrNPEPMBSDULo6JPrnsfulPIuYQ2EaShWPrDYDC2cJofJzRXR0ewNrX66FKVp0SrfIhkgovrHGZCnldpAOpg54IQdi79P7nRQ92TQbqbn+x9sCsTTIEjw/YEcF7FoyVwlJZvcqCt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708842994; c=relaxed/simple; bh=v3UZ8ds5QU/o7sVmthaXo8YZ5pwg1PKZOFS3pOvns5k=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=A6aONmLScXq7hbRYfVGqjspNW2weQSojq07fRebSNg8OyXn8SyeHWYfrZqGMwS94JXVUT0I8780KxRqWoAeNsd3iCrBAcF6wRJ9ntqQxcgP7wPMHXTYm8GYDi63fADgX2VZ8eXa2yFagCIVcfDKrUEgjV5ZArbMXQBS94UBj2hw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aw9EbUxr; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67450C433F1; Sun, 25 Feb 2024 06:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708842993; bh=v3UZ8ds5QU/o7sVmthaXo8YZ5pwg1PKZOFS3pOvns5k=; h=From:To:Cc:Subject:Date:From; b=aw9EbUxrkUgbBFiIFyVNWncZW/uSyV/yL0Ay5BeEwemq4ZzQivP3zkIAAHwq4XQ66 XYL3GJufcu6RTH8ylqK+wzo7BnY/LokCIlyZ2uGIdnG8npkEjxJiTsKoPnetgIdSLZ bcWj+f9pI0JUfN1TuBy6RhPtA7OTPXpXRiqaRkIUtRQJidy82YmpDofmAsE72eSeJC Pcerqhkom1CUEt65F5keXkjf322+DDc0xVzKdvd5FFNkgxFaxm2E9s/uanYsNtwnYb ypNoDvq0N9u+lL3qkv8afnncXwGyOUO+4QCUam/hWkhkT2L12kEmJDBcGd9qsBxBJi OJ6fudemjgJfA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v2] f2fs: fix to use correct segment type in f2fs_allocate_data_block() Date: Sun, 25 Feb 2024 14:36:28 +0800 Message-Id: <20240225063628.2086320-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791851769397035130 X-GMAIL-MSGID: 1791851769397035130 @type in f2fs_allocate_data_block() indicates log header's type, it can be CURSEG_COLD_DATA_PINNED or CURSEG_ALL_DATA_ATGC, rather than type of data/node, however IS_DATASEG()/IS_NODESEG() only accept later one, fix it. Fixes: 093749e296e2 ("f2fs: support age threshold based garbage collection") Signed-off-by: Chao Yu --- v2: - use curseg->seg_type instead of se->type due to se is valid only in atgc allocation context. fs/f2fs/segment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index d4f228e6f771..847fe0b7f29f 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3538,12 +3538,12 @@ int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr)); locate_dirty_segment(sbi, GET_SEGNO(sbi, *new_blkaddr)); - if (IS_DATASEG(type)) + if (IS_DATASEG(curseg->seg_type)) atomic64_inc(&sbi->allocated_data_blocks); up_write(&sit_i->sentry_lock); - if (page && IS_NODESEG(type)) { + if (page && IS_NODESEG(curseg->seg_type)) { fill_node_footer_blkaddr(page, NEXT_FREE_BLKADDR(sbi, curseg)); f2fs_inode_chksum_set(sbi, page);