Skip to content

Commit b362c73

Browse files
bbkzzMike Snitzer
authored andcommitted
dm: push error reporting down to dm_register_target()
Simplifies each DM target's init method by making dm_register_target() responsible for its error reporting (on behalf of targets). Signed-off-by: Yangtao Li <frank.li@vivo.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
1 parent 6b79a42 commit b362c73

18 files changed

Lines changed: 24 additions & 107 deletions

drivers/md/dm-cache-target.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3459,7 +3459,6 @@ static int __init dm_cache_init(void)
34593459

34603460
r = dm_register_target(&cache_target);
34613461
if (r) {
3462-
DMERR("cache target registration failed: %d", r);
34633462
kmem_cache_destroy(migration_cache);
34643463
return r;
34653464
}

drivers/md/dm-clone-target.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,6 @@ static int __init dm_clone_init(void)
22042204

22052205
r = dm_register_target(&clone_target);
22062206
if (r < 0) {
2207-
DMERR("Failed to register clone target");
22082207
kmem_cache_destroy(_hydration_cache);
22092208
return r;
22102209
}

drivers/md/dm-crypt.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3662,13 +3662,7 @@ static struct target_type crypt_target = {
36623662

36633663
static int __init dm_crypt_init(void)
36643664
{
3665-
int r;
3666-
3667-
r = dm_register_target(&crypt_target);
3668-
if (r < 0)
3669-
DMERR("register failed %d", r);
3670-
3671-
return r;
3665+
return dm_register_target(&crypt_target);
36723666
}
36733667

36743668
static void __exit dm_crypt_exit(void)

drivers/md/dm-delay.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -370,18 +370,7 @@ static struct target_type delay_target = {
370370

371371
static int __init dm_delay_init(void)
372372
{
373-
int r;
374-
375-
r = dm_register_target(&delay_target);
376-
if (r < 0) {
377-
DMERR("register failed %d", r);
378-
goto bad_register;
379-
}
380-
381-
return 0;
382-
383-
bad_register:
384-
return r;
373+
return dm_register_target(&delay_target);
385374
}
386375

387376
static void __exit dm_delay_exit(void)

drivers/md/dm-dust.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -573,12 +573,7 @@ static struct target_type dust_target = {
573573

574574
static int __init dm_dust_init(void)
575575
{
576-
int r = dm_register_target(&dust_target);
577-
578-
if (r < 0)
579-
DMERR("dm_register_target failed %d", r);
580-
581-
return r;
576+
return dm_register_target(&dust_target);
582577
}
583578

584579
static void __exit dm_dust_exit(void)

drivers/md/dm-ebs-target.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,7 @@ static struct target_type ebs_target = {
455455

456456
static int __init dm_ebs_init(void)
457457
{
458-
int r = dm_register_target(&ebs_target);
459-
460-
if (r < 0)
461-
DMERR("register failed %d", r);
462-
463-
return r;
458+
return dm_register_target(&ebs_target);
464459
}
465460

466461
static void dm_ebs_exit(void)

drivers/md/dm-era-target.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,15 +1756,7 @@ static struct target_type era_target = {
17561756

17571757
static int __init dm_era_init(void)
17581758
{
1759-
int r;
1760-
1761-
r = dm_register_target(&era_target);
1762-
if (r) {
1763-
DMERR("era target registration failed: %d", r);
1764-
return r;
1765-
}
1766-
1767-
return 0;
1759+
return dm_register_target(&era_target);
17681760
}
17691761

17701762
static void __exit dm_era_exit(void)

drivers/md/dm-flakey.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -509,12 +509,7 @@ static struct target_type flakey_target = {
509509

510510
static int __init dm_flakey_init(void)
511511
{
512-
int r = dm_register_target(&flakey_target);
513-
514-
if (r < 0)
515-
DMERR("register failed %d", r);
516-
517-
return r;
512+
return dm_register_target(&flakey_target);
518513
}
519514

520515
static void __exit dm_flakey_exit(void)

drivers/md/dm-integrity.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4704,7 +4704,6 @@ static int __init dm_integrity_init(void)
47044704

47054705
r = dm_register_target(&integrity_target);
47064706
if (r < 0) {
4707-
DMERR("register failed %d", r);
47084707
kmem_cache_destroy(journal_io_cache);
47094708
return r;
47104709
}

drivers/md/dm-log-writes.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -940,12 +940,7 @@ static struct target_type log_writes_target = {
940940

941941
static int __init dm_log_writes_init(void)
942942
{
943-
int r = dm_register_target(&log_writes_target);
944-
945-
if (r < 0)
946-
DMERR("register failed %d", r);
947-
948-
return r;
943+
return dm_register_target(&log_writes_target);
949944
}
950945

951946
static void __exit dm_log_writes_exit(void)

0 commit comments

Comments
 (0)