From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53A3E47D46A for ; Thu, 20 Aug 2026 16:43:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787244228; cv=none; b=mFdux7oaY3YxXR5qZIkmN4jHTwKQb/C5q6JJNuDuQ8dsVUgAKIltO44FlXmLjzdn/En8LJal90+JqZTuyqCz6hzDnsodm1l0VwAJOIHU/fkk+V6z4itXCXZbSsNqxVa1R057ug10pLnW9DBbgwLLf2QM+FdXH6gzoT5Uaj27PDA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787244228; c=relaxed/simple; bh=p7hiAUtsvjbEowbejTyAQ85s8hcMj5lP733TaD847Og=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ElGgHHFw+f+QayfWB1kpCCae001HEv0K7wKREEHsbJUigRYmFaVHZ6JlYt2307sU0BIwSkesUrec4pF5+McL84cY1NCO5ZZi7rw2TrR9tIXLAF/HUpCHuWWy38skZRrGdEjcKzhypAsmbt8ZxTLhugGjxmEwQ+CAqhSQa1fT2J4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SAl/d5NW; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SAl/d5NW" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c9b373d5af0so82126a12.2 for ; Thu, 20 Aug 2026 09:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787244224; x=1787849024; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=RFM8Ikwybwd2rTJ1nTIy8PeNwMoT60bA78u9TlckWQI=; b=SAl/d5NW/vw+EipQTxiPNTe9lCASkKjMIn0o6rm4RPekZu/E/i6P6gZLxYZwY8HNJd WBshMmZ4rlAoCYNewkdflPX2j7bKvyJBfWvR3TcKKlKrqGpyv9mW68ZMEdQe9wvDA1Ei HkHih/sRH0LhKgGTmSNeBovhib1VWUN97rpymLFBNDjIBBD2388SCM20GXOnTSxRunmV PevGuOCxrO8LWvT17w4aFKCAOOordKwAyJOZNvS3LRVfP8J8KlmbZaJ7EGqstZUoHWEt Bg0mXBXZBTmSsNYIXxcZgd29l6/gD03jyOfpBjnVjP8C1+UrOHQWH3b5DdNMgVyZuMEO vOjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787244224; x=1787849024; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RFM8Ikwybwd2rTJ1nTIy8PeNwMoT60bA78u9TlckWQI=; b=SM04SFGugmqGRE4hH4SSA6Q3wUNUUrVl58AxUojtl42H92hYjm+Jlr55c5nar/4cNY aph962JOzKR0wDltQgVy0PXmNmL8PKMdDeIwowgRMfm0TrLhYbmHpEdTs9kEU9RlmaX3 4gaN1NKWary+PaMQi/moU3yHHXhsWGL378Ck1wM1qP5Xa46+I91YzqaotQMKLT5EL2c9 sM4GfccoJHbx4NCbAGBKvwq8jAK6JYNXXpt0y1E8bBUGxDLE3R74jpAbq6AHOXKNUEJm 8/MJxuxYhocgkneel/C4p2jeRu1u98LWP06O+NatZgjvZ4pEaQf2F/1tCaR8X1JHorwI HPAw== X-Gm-Message-State: AOJu0Yz/KHBROu81wiFMa6od3CXN4fMfgfUnq35322b6YI9p5qfGjt2e H4C+QxjOyEQbk79osoq8X16qek4KgonX48BaeAj6WAoWFQRQfPPudUEBs3hw+w== X-Gm-Gg: AR+sD10YSmMw+NX34HqNLcgQiUI25t7oL/QE6xYp4+8zNkO/nFMdYRle411Qny8VxcX 0nBP8mOGtH/WpH8o7+ffkOsORPWcjGOtOdOnWdk106OZjmn5z0+AZQPsGG8u4qul15jyZ/+5kia w4zGk0EATn6FajqLPjEL5VzQfQEzNg4J5Tr+mHQwHnv41MN8iWoBerbpHAmuHw2BK3ZxhltGcQn oxkPbmmSkfR/O3oOzQcgBVjg2ifMLEtCq9KL0f1t2EMTRWXYQsYmUDMwkt4TtZ7CYbutkZ09+pa mxsXPW6os9ddN+uUqsfXSRoP6pyZ4M0c4FkoP8PtVNAWUhFrnuy4+WAd7uGvyZB+JudLujNzxPV 8Fgv0F8gmgiZ4B9nNx19UCTXh/VbMS/iK3EgANF341r3EroU47Np85sk0oTU4DRAmOtA3iYqF0H AGWw3dB1tfk53H6dEtc9ilOFRcpYIHZwXKWqWxuDOZzS/CGR9LRdZJySdsXDdEn7MeYZkYnl7sH 3+wCplpOAihiPovepDe/VSVZrEr9r0zq9v0zP1GQU/OVTX3Zt/QdTDskKjO83yWVYrK2gC9Se35 QJv+A6kcqwOt X-Received: by 2002:a05:6a21:6b0f:b0:3c3:8c91:5da0 with SMTP id adf61e73a8af0-3cd012342ecmr27718050637.15.1787244224374; Thu, 20 Aug 2026 09:43:44 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2a00:79e0:2e7c:8:9456:9545:1ce8:7c65]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-327bef77bfcsm16485695eec.9.2026.08.20.09.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2026 09:43:43 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong , Sunmin Jeong Subject: [PATCH v2] f2fs: avoid setting SBI_NEED_FSCK on transient resize failure Date: Thu, 20 Aug 2026 09:43:40 -0700 Message-ID: <20260820164340.2802152-1-daeho43@gmail.com> X-Mailer: git-send-email 2.55.0.737.g08866a6d13-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Daeho Jeong When free_segment_range() fails in f2fs_resize_fs(), no on-disk superblock or filesystem metadata has been modified yet, and free_segment_range() safely restores all in-memory counters before returning. However, the current error recovery path unconditionally sets the SBI_NEED_FSCK flag and prints a scary error message on any error, forcing an unnecessary and time-consuming fsck.f2fs repair on the subsequent mount/reboot. Fix this by separating the error recovery path with a dedicated recover_user_blocks label to bypass setting SBI_NEED_FSCK on free_segment_range() failures. Signed-off-by: Daeho Jeong Signed-off-by: Sunmin Jeong --- v2: separate error recovery path to bypass SBI_NEED_FSCK on free_segment_range() failure and add f2fs_bug_on() in recover_out. --- fs/f2fs/gc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index c4da2f31805b..3215630c353d 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -2440,7 +2440,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count) set_sbi_flag(sbi, SBI_IS_RESIZEFS); err = free_segment_range(sbi, secs, false); if (err) - goto recover_out; + goto recover_user_blocks; update_sb_metadata(sbi, -secs); @@ -2462,11 +2462,14 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count) f2fs_commit_super(sbi, false); } recover_out: - clear_sbi_flag(sbi, SBI_IS_RESIZEFS); if (err) { + f2fs_bug_on(sbi, err == -EAGAIN); set_sbi_flag(sbi, SBI_NEED_FSCK); f2fs_err(sbi, "resize_fs failed, should run fsck to repair!"); - + } +recover_user_blocks: + clear_sbi_flag(sbi, SBI_IS_RESIZEFS); + if (err) { spin_lock(&sbi->stat_lock); sbi->user_block_count += shrunk_blocks; spin_unlock(&sbi->stat_lock); -- 2.55.0.737.g08866a6d13-goog