2022-09-21 04:21:10

by Ryusuke Konishi

Subject: [PATCH 0/2] nilfs2 minor amendments

Hi Andrew,

please queue the following changes for the next merge window.
Both are minor coding-level fixes by users of a robot reporter.

Minghao Chi (1):
nilfs2: delete unnecessary checks before brelse()

ye xingchen (1):
nilfs2: Remove the unneeded result variable


Thanks,
Ryusuke Konishi
--
fs/nilfs2/btree.c | 6 ++----
fs/nilfs2/segment.c | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)

--
2.34.1

2022-09-21 04:40:46

by Ryusuke Konishi

Subject: [PATCH 2/2] nilfs2: Remove the unneeded result variable

From: ye xingchen <[email protected]>

Return the value nilfs_segctor_sync() directly instead of storing it in
another redundant variable.

Link: https://lkml.kernel.org/r/[email protected]
Reported-by: Zeal Robot <[email protected]>
Signed-off-by: ye xingchen <[email protected]>
Signed-off-by: Ryusuke Konishi <[email protected]>
---
fs/nilfs2/segment.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 0afe0832c754..9abae2c9120e 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2235,7 +2235,6 @@ int nilfs_construct_segment(struct super_block *sb)
struct the_nilfs *nilfs = sb->s_fs_info;
struct nilfs_sc_info *sci = nilfs->ns_writer;
struct nilfs_transaction_info *ti;
- int err;

if (!sci)
return -EROFS;
@@ -2243,8 +2242,7 @@ int nilfs_construct_segment(struct super_block *sb)
/* A call inside transactions causes a deadlock. */
BUG_ON((ti = current->journal_info) && ti->ti_magic == NILFS_TI_MAGIC);

- err = nilfs_segctor_sync(sci);
- return err;
+ return nilfs_segctor_sync(sci);
}

/**
--
2.34.1