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 Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7460C54798 for ; Sun, 25 Feb 2024 06:36:53 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1re881-0002Bg-Nc; Sun, 25 Feb 2024 06:36:50 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1re87z-0002BO-Po for linux-f2fs-devel@lists.sourceforge.net; Sun, 25 Feb 2024 06:36:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GOuuxwqoIZC4qW+Ex9IXCfTLbQ9gLlWTmUFnBmd538Y=; b=Yi7J0H/oXhZIrNLUgG098ud7k3 vqewRvU4Vj/Cxc6nmBVNGAIhN95EQxnneo3cLIzxU/43BfHCPCm2fAsrQOT31Wi8hl3ZBOlwJRHlU EQ3nt29M5MW931DBZqavfoZ+etKdPM/6i28AABJCcajlRbv15Vrzrmo4P/s4ktE8Spyc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=GOuuxwqoIZC4qW+Ex9IXCfTLbQ9gLlWTmUFnBmd538Y=; b=V a5nned4LEdd8JdwhZSeiimQb+MwJEZdwCNBqznNUzXNpmxjQaMNEhCaJ29mkFKKdblJu/oRkjv0TC H0iwBYf9pDbfr9Aou8iEqeyjtEx/4EVAI+rqAtVOT8ry6Uazh1Ygj4PpY839inaGrl9Sw/u3Qz3EB AzzzikltDQEZ5ka0=; Received: from sin.source.kernel.org ([145.40.73.55]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1re87z-0003HC-IQ for linux-f2fs-devel@lists.sourceforge.net; Sun, 25 Feb 2024 06:36:48 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 99F0ECE0A0A for ; Sun, 25 Feb 2024 06:36:35 +0000 (UTC) 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 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 MIME-Version: 1.0 X-Headers-End: 1re87z-0003HC-IQ Subject: [f2fs-dev] [PATCH v2] f2fs: fix to use correct segment type in f2fs_allocate_data_block() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net @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); -- 2.40.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aw9EbUxr" 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 Content-Transfer-Encoding: 8bit @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); -- 2.40.1