From: Joshua Crofts <joshua.crofts1@gmail.com>
To: Ryusuke Konishi <konishi.ryusuke@gmail.com>,
Viacheslav Dubeyko <slava@dubeyko.com>
Cc: linux-nilfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Joshua Crofts <joshua.crofts1@gmail.com>
Subject: [PATCH] nilfs2: remove '#if 0' code blocks
Date: Sat, 05 Sep 2026 06:48:59 +0200 [thread overview]
Message-ID: <20260905-nilfs2-dead-code-cleanup-v1-1-348ed97b2443@gmail.com> (raw)
There are two instances of '#if 0' code blocks that are dead code.
Remove these code blocks.
Additionally, remove unnecessary brackets around a single-statement
if per checkpatch rules.
Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
---
Stumbled upon these blocks when grepping the kernel for #if 0. Not sure
if they are actually used for debugging; if so, I have no issues with
the patch being dropped.
Thanks!
---
fs/nilfs2/inode.c | 5 -----
fs/nilfs2/super.c | 8 ++------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 34e6096069ad..c5b0e9f272b7 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -422,11 +422,6 @@ int nilfs_read_inode_common(struct inode *inode,
inode->i_blocks = le64_to_cpu(raw_inode->i_blocks);
ii->i_flags = le32_to_cpu(raw_inode->i_flags);
-#if 0
- ii->i_file_acl = le32_to_cpu(raw_inode->i_file_acl);
- ii->i_dir_acl = S_ISREG(inode->i_mode) ?
- 0 : le32_to_cpu(raw_inode->i_dir_acl);
-#endif
ii->i_dir_start_lookup = 0;
inode->i_generation = le32_to_cpu(raw_inode->i_generation);
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 893a504cb80c..89fa6faa34d2 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -824,13 +824,9 @@ static int nilfs_setup_super(struct super_block *sb, int is_mount)
max_mnt_count = le16_to_cpu(sbp[0]->s_max_mnt_count);
mnt_count = le16_to_cpu(sbp[0]->s_mnt_count);
- if (nilfs->ns_mount_state & NILFS_ERROR_FS) {
+ if (nilfs->ns_mount_state & NILFS_ERROR_FS)
nilfs_warn(sb, "mounting fs with errors");
-#if 0
- } else if (max_mnt_count >= 0 && mnt_count >= max_mnt_count) {
- nilfs_warn(sb, "maximal mount count reached");
-#endif
- }
+
if (!max_mnt_count)
sbp[0]->s_max_mnt_count = cpu_to_le16(NILFS_DFL_MAX_MNT_COUNT);
---
base-commit: 4d7d9486c04d917265f64c55bd23b2cc4fe7749c
change-id: 20260905-nilfs2-dead-code-cleanup-cefbe2773172
Best regards,
--
Kind regards,
Joshua Crofts
next reply other threads:[~2026-09-05 4:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-05 4:48 Joshua Crofts [this message]
2026-09-06 16:47 ` [PATCH] nilfs2: remove '#if 0' code blocks Ryusuke Konishi
2026-09-06 20:55 ` Joshua Crofts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260905-nilfs2-dead-code-cleanup-v1-1-348ed97b2443@gmail.com \
--to=joshua.crofts1@gmail.com \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=slava@dubeyko.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.