Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
  dm snapshot: extend exception store functions
  dm snapshot: split out exception store implementations
  dm snapshot: rename struct exception_store
  dm snapshot: separate out exception store interface
  dm mpath: move trigger_event to system workqueue
  dm: add name and uuid to sysfs
  dm table: rework reference counting
  dm: support barriers on simple devices
  dm request: extend target interface
  dm request: add caches
  dm ioctl: allow dm_copy_name_and_uuid to return only one field
  dm log: ensure log bitmap fits on log device
  dm log: move region_size validation
  dm log: avoid reinitialising io_req on every operation
  dm: consolidate target deregistration error handling
  dm raid1: fix error count
  dm log: fix dm_io_client leak on error paths
  dm snapshot: change yield to msleep
  dm table: drop reference at unbind

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 835cf95b857f..7decf10006e4 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -130,26 +130,26 @@ int dm_register_target(struct target_type *t)
         return rv;
 }
 
-int dm_unregister_target(struct target_type *t)
+void dm_unregister_target(struct target_type *t)
 {
         struct tt_internal *ti;
 
         down_write(&_lock);
         if (!(ti = __find_target_type(t->name))) {
-                up_write(&_lock);
-                return -EINVAL;
+                DMCRIT("Unregistering unrecognised target: %s", t->name);
+                BUG();
         }
 
         if (ti->use) {
-                up_write(&_lock);
-                return -ETXTBSY;
+                DMCRIT("Attempt to unregister target still in use: %s",
+                       t->name);
+                BUG();
         }
 
         list_del(&ti->list);
         kfree(ti);
 
         up_write(&_lock);
-        return 0;
 }
 
 /*
@@ -187,8 +187,7 @@ int __init dm_target_init(void)
 
 void dm_target_exit(void)
 {
-        if (dm_unregister_target(&error_target))
-                DMWARN("error target unregistration failed");
+        dm_unregister_target(&error_target);
 }
 
 EXPORT_SYMBOL(dm_register_target);