quota: remove unneeded return value of register_quota_format

The register_quota_format always returns 0, simply remove unneeded return
value.

Link: https://patch.msgid.link/20240715130534.2112678-3-shikemeng@huaweicloud.com
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index afee70125ae3bf0e7e64189dd594e541a7c6ba89..73caa8914ebed16e4f37ebde933fbc122c54679c 100644 (file)
--- 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 104927804bec55048b33ff3877cebfc434f94715..1ddd1e9d1eeb162695c9a5ea3f7891468271815a 100644 (file)
--- 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 3f3e8acc05db81a707fb7e8225e63a8aa7628706..6f7f0b4afba903673e80979c80b4264f07c5e2f1 100644 (file)
--- 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 c48c233f3bef04b62f90f63b3e2546f0eb343b63..1fda93dcbc1bb63b676e1c089a7d6952cf09efdf 100644 (file)
--- 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 07071e64abf3d66298680b829a2d3b251ebbde5d..89a0d83ddad082e505b38765b4d84a3d1dd54297 100644 (file)
--- 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 2faa9daaf54baaf853460fcd424d6bfe5fb1a056..3b922d44e12c92575a0f86458b36edf47405809d 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -4818,11 +4818,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);
@@ -4857,7 +4853,6 @@ out1:
 out2:
 #ifdef CONFIG_TMPFS_QUOTA
        unregister_quota_format(&shmem_quota_format);
-out3:
 #endif
        shmem_destroy_inodecache();
        shm_mnt = ERR_PTR(error);