The patch titled
unregister_blkdev() delete redundant messages in callers
has been added to the -mm tree. Its filename is
unregister_blkdev-delete-redundant-messages-in-callers.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: unregister_blkdev() delete redundant messages in callers
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
No need to warn unregister_blkdev() failure by the callers. (The previous
patch makes unregister_blkdev() print error message in error case)
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/loop.c | 3 +--
drivers/block/z2ram.c | 4 +---
drivers/md/dm.c | 4 +---
drivers/s390/block/dcssblk.c | 7 +------
drivers/sbus/char/jsflash.c | 3 +--
5 files changed, 5 insertions(+), 16 deletions(-)
diff -puN drivers/block/loop.c~unregister_blkdev-delete-redundant-messages-in-callers drivers/block/loop.c
--- a/drivers/block/loop.c~unregister_blkdev-delete-redundant-messages-in-callers
+++ a/drivers/block/loop.c
@@ -1551,8 +1551,7 @@ static void __exit loop_exit(void)
loop_del_one(lo);
blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range);
- if (unregister_blkdev(LOOP_MAJOR, "loop"))
- printk(KERN_WARNING "loop: cannot unregister blkdev\n");
+ unregister_blkdev(LOOP_MAJOR, "loop");
}
module_init(loop_init);
diff -puN drivers/block/z2ram.c~unregister_blkdev-delete-redundant-messages-in-callers drivers/block/z2ram.c
--- a/drivers/block/z2ram.c~unregister_blkdev-delete-redundant-messages-in-callers
+++ a/drivers/block/z2ram.c
@@ -371,9 +371,7 @@ static void __exit z2_exit(void)
{
int i, j;
blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256);
- if ( unregister_blkdev( Z2RAM_MAJOR, DEVICE_NAME ) != 0 )
- printk( KERN_ERR DEVICE_NAME ": unregister of device failed\n");
-
+ unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME);
del_gendisk(z2ram_gendisk);
put_disk(z2ram_gendisk);
blk_cleanup_queue(z2_queue);
diff -puN drivers/md/dm.c~unregister_blkdev-delete-redundant-messages-in-callers drivers/md/dm.c
--- a/drivers/md/dm.c~unregister_blkdev-delete-redundant-messages-in-callers
+++ a/drivers/md/dm.c
@@ -165,9 +165,7 @@ static void local_exit(void)
{
kmem_cache_destroy(_tio_cache);
kmem_cache_destroy(_io_cache);
-
- if (unregister_blkdev(_major, _name) < 0)
- DMERR("unregister_blkdev failed");
+ unregister_blkdev(_major, _name);
_major = 0;
diff -puN drivers/s390/block/dcssblk.c~unregister_blkdev-delete-redundant-messages-in-callers drivers/s390/block/dcssblk.c
--- a/drivers/s390/block/dcssblk.c~unregister_blkdev-delete-redundant-messages-in-callers
+++ a/drivers/s390/block/dcssblk.c
@@ -747,14 +747,9 @@ dcssblk_check_params(void)
static void __exit
dcssblk_exit(void)
{
- int rc;
-
PRINT_DEBUG("DCSSBLOCK EXIT...\n");
s390_root_dev_unregister(dcssblk_root_dev);
- rc = unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
- if (rc) {
- PRINT_ERR("unregister_blkdev() failed!\n");
- }
+ unregister_blkdev(dcssblk_major, DCSSBLK_NAME);
PRINT_DEBUG("...finished!\n");
}
diff -puN drivers/sbus/char/jsflash.c~unregister_blkdev-delete-redundant-messages-in-callers drivers/sbus/char/jsflash.c
--- a/drivers/sbus/char/jsflash.c~unregister_blkdev-delete-redundant-messages-in-callers
+++ a/drivers/sbus/char/jsflash.c
@@ -619,8 +619,7 @@ static void __exit jsflash_cleanup_modul
jsf0.busy = 0;
misc_deregister(&jsf_dev);
- if (unregister_blkdev(JSFD_MAJOR, "jsfd") != 0)
- printk("jsfd: cleanup_module failed\n");
+ unregister_blkdev(JSFD_MAJOR, "jsfd");
blk_cleanup_queue(jsf_queue);
}
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
git-dvb.patch
git-netdev-all.patch
auth_gss-unregister-gss_domain-when-unloading-module.patch
fault-injection-add-min-order-parameter-to-fail_page_alloc.patch
fault-injection-fix-example-scripts-in-documentation.patch
unregister_chrdev-ignore-the-return-value.patch
unregister_chrdev-return-void.patch
unregister_blkdev-do-warn_on-on-failure.patch
unregister_blkdev-delete-redundant-messages-in-callers.patch
unregister_blkdev-delete-redundant-message.patch
unregister_blkdev-return-void.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
