* [PATCH v2] nilfs2: remove '#if 0' code blocks
@ 2026-09-07 5:34 Joshua Crofts
2026-09-07 8:23 ` Ryusuke Konishi
0 siblings, 1 reply; 3+ messages in thread
From: Joshua Crofts @ 2026-09-07 5:34 UTC (permalink / raw)
To: Ryusuke Konishi, Viacheslav Dubeyko
Cc: linux-nilfs, linux-kernel, Joshua Crofts
There are two instances of '#if 0' code blocks that are dead code.
Remove these code blocks.
Additionally, remove a commented out section containing similar code
as the '#if 0' block and unnecessary brackets around a single-statement
if per checkpatch rules.
Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
---
Changes in v2:
- remove block of commented out code (Ryusuke).
---
fs/nilfs2/inode.c | 7 -------
fs/nilfs2/super.c | 8 ++------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 34e6096069ad..778274203f4c 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -342,8 +342,6 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
ii->i_flags = nilfs_mask_flags(
mode, NILFS_I(dir)->i_flags & NILFS_FL_INHERITED);
- /* ii->i_file_acl = 0; */
- /* ii->i_dir_acl = 0; */
ii->i_dir_start_lookup = 0;
nilfs_set_inode_flags(inode);
inode->i_generation = get_random_u32();
@@ -422,11 +420,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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] nilfs2: remove '#if 0' code blocks
2026-09-07 5:34 [PATCH v2] nilfs2: remove '#if 0' code blocks Joshua Crofts
@ 2026-09-07 8:23 ` Ryusuke Konishi
2026-09-07 17:17 ` Viacheslav Dubeyko
0 siblings, 1 reply; 3+ messages in thread
From: Ryusuke Konishi @ 2026-09-07 8:23 UTC (permalink / raw)
To: Viacheslav Dubeyko; +Cc: Joshua Crofts, linux-nilfs, linux-kernel
On Mon, Sep 7, 2026 at 2:34 PM Joshua Crofts wrote:
>
> There are two instances of '#if 0' code blocks that are dead code.
> Remove these code blocks.
>
> Additionally, remove a commented out section containing similar code
> as the '#if 0' block and unnecessary brackets around a single-statement
> if per checkpatch rules.
>
> Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
> ---
> Changes in v2:
> - remove block of commented out code (Ryusuke).
Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Viacheslav, could you please apply this directly to your tree for the
next cycle?
Thanks,
Ryusuke Konishi
> ---
> fs/nilfs2/inode.c | 7 -------
> fs/nilfs2/super.c | 8 ++------
> 2 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
> index 34e6096069ad..778274203f4c 100644
> --- a/fs/nilfs2/inode.c
> +++ b/fs/nilfs2/inode.c
> @@ -342,8 +342,6 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
> ii->i_flags = nilfs_mask_flags(
> mode, NILFS_I(dir)->i_flags & NILFS_FL_INHERITED);
>
> - /* ii->i_file_acl = 0; */
> - /* ii->i_dir_acl = 0; */
> ii->i_dir_start_lookup = 0;
> nilfs_set_inode_flags(inode);
> inode->i_generation = get_random_u32();
> @@ -422,11 +420,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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] nilfs2: remove '#if 0' code blocks
2026-09-07 8:23 ` Ryusuke Konishi
@ 2026-09-07 17:17 ` Viacheslav Dubeyko
0 siblings, 0 replies; 3+ messages in thread
From: Viacheslav Dubeyko @ 2026-09-07 17:17 UTC (permalink / raw)
To: Ryusuke Konishi; +Cc: Joshua Crofts, linux-nilfs, linux-kernel
On Mon, 2026-09-07 at 17:23 +0900, Ryusuke Konishi wrote:
> On Mon, Sep 7, 2026 at 2:34 PM Joshua Crofts wrote:
> >
> > There are two instances of '#if 0' code blocks that are dead code.
> > Remove these code blocks.
> >
> > Additionally, remove a commented out section containing similar
> > code
> > as the '#if 0' block and unnecessary brackets around a single-
> > statement
> > if per checkpatch rules.
> >
> > Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
> > ---
> > Changes in v2:
> > - remove block of commented out code (Ryusuke).
>
> Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
>
> Viacheslav, could you please apply this directly to your tree for the
> next cycle?
>
> Thanks,
> Ryusuke Konishi
>
> > ---
> > fs/nilfs2/inode.c | 7 -------
> > fs/nilfs2/super.c | 8 ++------
> > 2 files changed, 2 insertions(+), 13 deletions(-)
> >
> > diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
> > index 34e6096069ad..778274203f4c 100644
> > --- a/fs/nilfs2/inode.c
> > +++ b/fs/nilfs2/inode.c
> > @@ -342,8 +342,6 @@ struct inode *nilfs_new_inode(struct inode
> > *dir, umode_t mode)
> > ii->i_flags = nilfs_mask_flags(
> > mode, NILFS_I(dir)->i_flags & NILFS_FL_INHERITED);
> >
> > - /* ii->i_file_acl = 0; */
> > - /* ii->i_dir_acl = 0; */
> > ii->i_dir_start_lookup = 0;
> > nilfs_set_inode_flags(inode);
> > inode->i_generation = get_random_u32();
> > @@ -422,11 +420,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
> >
Applied.
Thanks,
Slava.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-09-07 17:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-07 5:34 [PATCH v2] nilfs2: remove '#if 0' code blocks Joshua Crofts
2026-09-07 8:23 ` Ryusuke Konishi
2026-09-07 17:17 ` Viacheslav Dubeyko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®