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, 5 insertions, 9 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 3d7f4923cd13..095f77bf9681 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -889,7 +889,7 @@ static int fail_path(struct pgpath *pgpath)
         dm_path_uevent(DM_UEVENT_PATH_FAILED, m->ti,
                       pgpath->path.dev->name, m->nr_valid_paths);
 
-        queue_work(kmultipathd, &m->trigger_event);
+        schedule_work(&m->trigger_event);
         queue_work(kmultipathd, &pgpath->deactivate_path);
 
 out:
@@ -932,7 +932,7 @@ static int reinstate_path(struct pgpath *pgpath)
         dm_path_uevent(DM_UEVENT_PATH_REINSTATED, m->ti,
                       pgpath->path.dev->name, m->nr_valid_paths);
 
-        queue_work(kmultipathd, &m->trigger_event);
+        schedule_work(&m->trigger_event);
 
 out:
         spin_unlock_irqrestore(&m->lock, flags);
@@ -976,7 +976,7 @@ static void bypass_pg(struct multipath *m, struct priority_group *pg,
 
         spin_unlock_irqrestore(&m->lock, flags);
 
-        queue_work(kmultipathd, &m->trigger_event);
+        schedule_work(&m->trigger_event);
 }
 
 /*
@@ -1006,7 +1006,7 @@ static int switch_pg_num(struct multipath *m, const char *pgstr)
         }
         spin_unlock_irqrestore(&m->lock, flags);
 
-        queue_work(kmultipathd, &m->trigger_event);
+        schedule_work(&m->trigger_event);
         return 0;
 }
 
@@ -1495,14 +1495,10 @@ static int __init dm_multipath_init(void)
 
 static void __exit dm_multipath_exit(void)
 {
-        int r;
-
         destroy_workqueue(kmpath_handlerd);
         destroy_workqueue(kmultipathd);
 
-        r = dm_unregister_target(&multipath_target);
-        if (r < 0)
-                DMERR("target unregister failed %d", r);
+        dm_unregister_target(&multipath_target);
         kmem_cache_destroy(_mpio_cache);
 }