File tree Expand file tree Collapse file tree 6 files changed +10
-20
lines changed Expand file tree Collapse file tree 6 files changed +10
-20
lines changed Original file line number Diff line number Diff line change @@ -1571,15 +1571,13 @@ static int __init ocfs2_init(void)
1571
1571
1572
1572
ocfs2_set_locking_protocol ();
1573
1573
1574
- status = register_quota_format (& ocfs2_quota_format );
1575
- if (status < 0 )
1576
- goto out3 ;
1574
+ register_quota_format (& ocfs2_quota_format );
1575
+
1577
1576
status = register_filesystem (& ocfs2_fs_type );
1578
1577
if (!status )
1579
1578
return 0 ;
1580
1579
1581
1580
unregister_quota_format (& ocfs2_quota_format );
1582
- out3 :
1583
1581
debugfs_remove (ocfs2_debugfs_root );
1584
1582
ocfs2_free_mem_caches ();
1585
1583
out2 :
Original file line number Diff line number Diff line change @@ -163,13 +163,12 @@ static struct quota_module_name module_names[] = INIT_QUOTA_MODULE_NAMES;
163
163
/* SLAB cache for dquot structures */
164
164
static struct kmem_cache * dquot_cachep ;
165
165
166
- int register_quota_format (struct quota_format_type * fmt )
166
+ void register_quota_format (struct quota_format_type * fmt )
167
167
{
168
168
spin_lock (& dq_list_lock );
169
169
fmt -> qf_next = quota_formats ;
170
170
quota_formats = fmt ;
171
171
spin_unlock (& dq_list_lock );
172
- return 0 ;
173
172
}
174
173
EXPORT_SYMBOL (register_quota_format );
175
174
Original file line number Diff line number Diff line change @@ -235,7 +235,8 @@ static struct quota_format_type v1_quota_format = {
235
235
236
236
static int __init init_v1_quota_format (void )
237
237
{
238
- return register_quota_format (& v1_quota_format );
238
+ register_quota_format (& v1_quota_format );
239
+ return 0 ;
239
240
}
240
241
241
242
static void __exit exit_v1_quota_format (void )
Original file line number Diff line number Diff line change @@ -440,12 +440,9 @@ static struct quota_format_type v2r1_quota_format = {
440
440
441
441
static int __init init_v2_quota_format (void )
442
442
{
443
- int ret ;
444
-
445
- ret = register_quota_format (& v2r0_quota_format );
446
- if (ret )
447
- return ret ;
448
- return register_quota_format (& v2r1_quota_format );
443
+ register_quota_format (& v2r0_quota_format );
444
+ register_quota_format (& v2r1_quota_format );
445
+ return 0 ;
449
446
}
450
447
451
448
static void __exit exit_v2_quota_format (void )
Original file line number Diff line number Diff line change @@ -526,7 +526,7 @@ struct quota_info {
526
526
const struct quota_format_ops * ops [MAXQUOTAS ]; /* Operations for each type */
527
527
};
528
528
529
- int register_quota_format (struct quota_format_type * fmt );
529
+ void register_quota_format (struct quota_format_type * fmt );
530
530
void unregister_quota_format (struct quota_format_type * fmt );
531
531
532
532
struct quota_module_name {
Original file line number Diff line number Diff line change @@ -4818,11 +4818,7 @@ void __init shmem_init(void)
4818
4818
shmem_init_inodecache ();
4819
4819
4820
4820
#ifdef CONFIG_TMPFS_QUOTA
4821
- error = register_quota_format (& shmem_quota_format );
4822
- if (error < 0 ) {
4823
- pr_err ("Could not register quota format\n" );
4824
- goto out3 ;
4825
- }
4821
+ register_quota_format (& shmem_quota_format );
4826
4822
#endif
4827
4823
4828
4824
error = register_filesystem (& shmem_fs_type );
@@ -4857,7 +4853,6 @@ void __init shmem_init(void)
4857
4853
out2 :
4858
4854
#ifdef CONFIG_TMPFS_QUOTA
4859
4855
unregister_quota_format (& shmem_quota_format );
4860
- out3 :
4861
4856
#endif
4862
4857
shmem_destroy_inodecache ();
4863
4858
shm_mnt = ERR_PTR (error );
You can’t perform that action at this time.
0 commit comments