The patch titled unregister_blkdev(): return void has been removed from the -mm tree. Its filename was unregister_blkdev-return-void.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: unregister_blkdev(): return void From: Akinobu Mita <akinobu.mita@xxxxxxxxx> Put WARN_ON and fixed all callers of unregister_blkdev(). Now we can make unregister_blkdev return void. Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/genhd.c | 7 +------ include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff -puN block/genhd.c~unregister_blkdev-return-void block/genhd.c --- a/block/genhd.c~unregister_blkdev-return-void +++ a/block/genhd.c @@ -108,13 +108,11 @@ out: EXPORT_SYMBOL(register_blkdev); -/* todo: make void - error printk here */ -int unregister_blkdev(unsigned int major, const char *name) +void unregister_blkdev(unsigned int major, const char *name) { struct blk_major_name **n; struct blk_major_name *p = NULL; int index = major_to_index(major); - int ret = 0; mutex_lock(&block_subsys_lock); for (n = &major_names[index]; *n; n = &(*n)->next) @@ -122,15 +120,12 @@ int unregister_blkdev(unsigned int major break; if (!*n || strcmp((*n)->name, name)) { WARN_ON(1); - ret = -EINVAL; } else { p = *n; *n = p->next; } mutex_unlock(&block_subsys_lock); kfree(p); - - return ret; } EXPORT_SYMBOL(unregister_blkdev); diff -puN include/linux/fs.h~unregister_blkdev-return-void include/linux/fs.h --- a/include/linux/fs.h~unregister_blkdev-return-void +++ a/include/linux/fs.h @@ -1527,7 +1527,7 @@ extern void putname(const char *name); #ifdef CONFIG_BLOCK extern int register_blkdev(unsigned int, const char *); -extern int unregister_blkdev(unsigned int, const char *); +extern void unregister_blkdev(unsigned int, const char *); extern struct block_device *bdget(dev_t); extern void bd_set_size(struct block_device *, loff_t size); extern void bd_forget(struct inode *inode); _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are origin.patch git-dvb.patch auth_gss-unregister-gss_domain-when-unloading-module.patch unregister_chrdev-ignore-the-return-value.patch unregister_chrdev-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