Looks good.
Reviewed-by: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
On 7/15/24 9:05 PM, Kemeng Shi wrote:
> The register_quota_format always returns 0, simply remove unneeded return
> value.
>
> Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
> ---
> fs/ocfs2/super.c | 6 ++----
> fs/quota/dquot.c | 3 +--
> fs/quota/quota_v1.c | 3 ++-
> fs/quota/quota_v2.c | 9 +++------
> include/linux/quota.h | 2 +-
> mm/shmem.c | 7 +------
> 6 files changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
> index afee70125ae3..73caa8914ebe 100644
> --- a/fs/ocfs2/super.c
> +++ b/fs/ocfs2/super.c
> @@ -1571,15 +1571,13 @@ static int __init ocfs2_init(void)
>
> ocfs2_set_locking_protocol();
>
> - status = register_quota_format(&ocfs2_quota_format);
> - if (status < 0)
> - goto out3;
> + register_quota_format(&ocfs2_quota_format);
> +
> status = register_filesystem(&ocfs2_fs_type);
> if (!status)
> return 0;
>
> unregister_quota_format(&ocfs2_quota_format);
> -out3:
> debugfs_remove(ocfs2_debugfs_root);
> ocfs2_free_mem_caches();
> out2:
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index 23fcf9e9d6c5..a08a71890cd8 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -163,13 +163,12 @@ static struct quota_module_name module_names[] = INIT_QUOTA_MODULE_NAMES;
> /* SLAB cache for dquot structures */
> static struct kmem_cache *dquot_cachep;
>
> -int register_quota_format(struct quota_format_type *fmt)
> +void register_quota_format(struct quota_format_type *fmt)
> {
> spin_lock(&dq_list_lock);
> fmt->qf_next = quota_formats;
> quota_formats = fmt;
> spin_unlock(&dq_list_lock);
> - return 0;
> }
> EXPORT_SYMBOL(register_quota_format);
>
> diff --git a/fs/quota/quota_v1.c b/fs/quota/quota_v1.c
> index 3f3e8acc05db..6f7f0b4afba9 100644
> --- a/fs/quota/quota_v1.c
> +++ b/fs/quota/quota_v1.c
> @@ -235,7 +235,8 @@ static struct quota_format_type v1_quota_format = {
>
> static int __init init_v1_quota_format(void)
> {
> - return register_quota_format(&v1_quota_format);
> + register_quota_format(&v1_quota_format);
> + return 0;
> }
>
> static void __exit exit_v1_quota_format(void)
> diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
> index c48c233f3bef..1fda93dcbc1b 100644
> --- a/fs/quota/quota_v2.c
> +++ b/fs/quota/quota_v2.c
> @@ -440,12 +440,9 @@ static struct quota_format_type v2r1_quota_format = {
>
> static int __init init_v2_quota_format(void)
> {
> - int ret;
> -
> - ret = register_quota_format(&v2r0_quota_format);
> - if (ret)
> - return ret;
> - return register_quota_format(&v2r1_quota_format);
> + register_quota_format(&v2r0_quota_format);
> + register_quota_format(&v2r1_quota_format);
> + return 0;
> }
>
> static void __exit exit_v2_quota_format(void)
> diff --git a/include/linux/quota.h b/include/linux/quota.h
> index 07071e64abf3..89a0d83ddad0 100644
> --- a/include/linux/quota.h
> +++ b/include/linux/quota.h
> @@ -526,7 +526,7 @@ struct quota_info {
> const struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */
> };
>
> -int register_quota_format(struct quota_format_type *fmt);
> +void register_quota_format(struct quota_format_type *fmt);
> void unregister_quota_format(struct quota_format_type *fmt);
>
> struct quota_module_name {
> diff --git a/mm/shmem.c b/mm/shmem.c
> index a8b181a63402..d27104e1af9b 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -4660,11 +4660,7 @@ void __init shmem_init(void)
> shmem_init_inodecache();
>
> #ifdef CONFIG_TMPFS_QUOTA
> - error = register_quota_format(&shmem_quota_format);
> - if (error < 0) {
> - pr_err("Could not register quota format\n");
> - goto out3;
> - }
> + register_quota_format(&shmem_quota_format);
> #endif
>
> error = register_filesystem(&shmem_fs_type);
> @@ -4693,7 +4689,6 @@ void __init shmem_init(void)
> out2:
> #ifdef CONFIG_TMPFS_QUOTA
> unregister_quota_format(&shmem_quota_format);
> -out3:
> #endif
> shmem_destroy_inodecache();
> shm_mnt = ERR_PTR(error);
