fs: remove useless plus one in super_cache_scan()

[PATCH] fs: remove useless plus one in super_cache_scan()

Posted by alexjlzheng@gmail.com 7 months, 3 weeks ago

From: Jinliang Zheng <alexjlzheng@tencent.com>

After commit 475d0db742e3 ("fs: Fix theoretical division by 0 in
super_cache_scan()."), there's no need to plus one to prevent
division by zero.

Remove it to simplify the code.

Signed-off-by: Jinliang Zheng <alexjlzheng@tencent.com>
---
 fs/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/super.c b/fs/super.c
index 97a17f9d9023..6bbdb7e59a8d 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -201,7 +201,7 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
 
 	inodes = list_lru_shrink_count(&sb->s_inode_lru, sc);
 	dentries = list_lru_shrink_count(&sb->s_dentry_lru, sc);
-	total_objects = dentries + inodes + fs_objects + 1;
+	total_objects = dentries + inodes + fs_objects;
 	if (!total_objects)
 		total_objects = 1;
 
-- 
2.49.0

Re: [PATCH] fs: remove useless plus one in super_cache_scan()

Posted by Christian Brauner 7 months, 3 weeks ago

On Mon, 28 Apr 2025 21:50:50 +0800, alexjlzheng@gmail.com wrote:
> After commit 475d0db742e3 ("fs: Fix theoretical division by 0 in
> super_cache_scan()."), there's no need to plus one to prevent
> division by zero.
> 
> Remove it to simplify the code.
> 
> 
> [...]

Applied to the vfs-6.16.misc branch of the vfs/vfs.git tree.
Patches in the vfs-6.16.misc branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs-6.16.misc

[1/1] fs: remove useless plus one in super_cache_scan()
      https://git.kernel.org/vfs/vfs/c/9f81d707022c

Re: [PATCH] fs: remove useless plus one in super_cache_scan()

Posted by Jan Kara 7 months, 3 weeks ago

On Mon 28-04-25 21:50:50, alexjlzheng@gmail.com wrote:
> From: Jinliang Zheng <alexjlzheng@tencent.com>
> 
> After commit 475d0db742e3 ("fs: Fix theoretical division by 0 in
> super_cache_scan()."), there's no need to plus one to prevent
> division by zero.
> 
> Remove it to simplify the code.
> 
> Signed-off-by: Jinliang Zheng <alexjlzheng@tencent.com>

Fair enough. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/super.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/super.c b/fs/super.c
> index 97a17f9d9023..6bbdb7e59a8d 100644
> --- a/fs/super.c
> +++ b/fs/super.c
> @@ -201,7 +201,7 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
>  
>  	inodes = list_lru_shrink_count(&sb->s_inode_lru, sc);
>  	dentries = list_lru_shrink_count(&sb->s_dentry_lru, sc);
> -	total_objects = dentries + inodes + fs_objects + 1;
> +	total_objects = dentries + inodes + fs_objects;
>  	if (!total_objects)
>  		total_objects = 1;
>  
> -- 
> 2.49.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR