[PATCH] md: remove nuisance message at shutdown

[linux-2.6] / drivers / md / dm-ioctl.c

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index f7e743691aa8198d03293e8e04b9195c54c757fa..3edb3477f987d4199c32d94e96d03e2c40e3ef1f 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001, 2002 Sistina Software (UK) Limited.
- * Copyright (C) 2004 - 2005 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004 - 2006 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the GPL.
  */
@@ -19,6 +19,7 @@
 
 #include <asm/uaccess.h>
 
+#define DM_MSG_PREFIX "ioctl"
 #define DM_DRIVER_EMAIL "dm-devel@redhat.com"
 
 /*-----------------------------------------------------------------
@@ -48,7 +49,7 @@ struct vers_iter {
 static struct list_head _name_buckets[NUM_BUCKETS];
 static struct list_head _uuid_buckets[NUM_BUCKETS];
 
-static void dm_hash_remove_all(void);
+static void dm_hash_remove_all(int keep_open_devices);
 
 /*
  * Guards access to both hash tables.
@@ -73,7 +74,7 @@ static int dm_hash_init(void)
 
 static void dm_hash_exit(void)
 {
-       dm_hash_remove_all();
+       dm_hash_remove_all(0);
        devfs_remove(DM_DIR);
 }
 
@@ -260,19 +261,41 @@ static void __hash_remove(struct hash_cell *hc)
        free_cell(hc);
 }
 
-static void dm_hash_remove_all(void)
+static void dm_hash_remove_all(int keep_open_devices)
 {
-       int i;
+       int i, dev_skipped, dev_removed;
        struct hash_cell *hc;
        struct list_head *tmp, *n;
 
        down_write(&_hash_lock);
+
+retry:
+       dev_skipped = dev_removed = 0;
        for (i = 0; i < NUM_BUCKETS; i++) {
                list_for_each_safe (tmp, n, _name_buckets + i) {
                        hc = list_entry(tmp, struct hash_cell, name_list);
+
+                       if (keep_open_devices &&
+                           dm_lock_for_deletion(hc->md)) {
+                               dev_skipped++;
+                               continue;
+                       }
                        __hash_remove(hc);
+                       dev_removed = 1;
                }
        }
+
+       /*
+        * Some mapped devices may be using other mapped devices, so if any
+        * still exist, repeat until we make no further progress.
+        */
+       if (dev_skipped) {
+               if (dev_removed)
+                       goto retry;
+
+               DMWARN("remove_all left %d open device(s)", dev_skipped);
+       }
+
        up_write(&_hash_lock);
 }
 
@@ -355,7 +378,7 @@ typedef int (*ioctl_fn)(struct dm_ioctl *param, size_t param_size);
 
 static int remove_all(struct dm_ioctl *param, size_t param_size)
 {
-       dm_hash_remove_all();
+       dm_hash_remove_all(1);
        param->data_size = 0;
        return 0;
 }
@@ -535,7 +558,6 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)
 {
        struct gendisk *disk = dm_disk(md);
        struct dm_table *table;
-       struct block_device *bdev;
 
        param->flags &= ~(DM_SUSPEND_FLAG | DM_READONLY_FLAG |
                          DM_ACTIVE_PRESENT_FLAG);
@@ -545,20 +567,12 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)
 
        param->dev = huge_encode_dev(MKDEV(disk->major, disk->first_minor));
 
-       if (!(param->flags & DM_SKIP_BDGET_FLAG)) {
-               bdev = bdget_disk(disk, 0);
-               if (!bdev)
-                       return -ENXIO;
-
-               /*
-                * Yes, this will be out of date by the time it gets back
-                * to userland, but it is still very useful for
-                * debugging.
-                */
-               param->open_count = bdev->bd_openers;
-               bdput(bdev);
-       } else
-               param->open_count = -1;
+       /*
+        * Yes, this will be out of date by the time it gets back
+        * to userland, but it is still very useful for
+        * debugging.
+        */
+       param->open_count = dm_open_count(md);
 
        if (disk->policy)
                param->flags |= DM_READONLY_FLAG;
@@ -578,7 +592,7 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)
 
 static int dev_create(struct dm_ioctl *param, size_t param_size)
 {
-       int r;
+       int r, m = DM_ANY_MINOR;
        struct mapped_device *md;
 
        r = check_name(param->name);
@@ -586,10 +600,9 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
                return r;
 
        if (param->flags & DM_PERSISTENT_DEV_FLAG)
-               r = dm_create_with_minor(MINOR(huge_decode_dev(param->dev)), &md);
-       else
-               r = dm_create(&md);
+               m = MINOR(huge_decode_dev(param->dev));
 
+       r = dm_create(m, &md);
        if (r)
                return r;
 
@@ -662,6 +675,7 @@ static int dev_remove(struct dm_ioctl *param, size_t param_size)
 {
        struct hash_cell *hc;
        struct mapped_device *md;
+       int r;
 
        down_write(&_hash_lock);
        hc = __find_device_hash_cell(param);
@@ -674,6 +688,17 @@ static int dev_remove(struct dm_ioctl *param, size_t param_size)
 
        md = hc->md;
 
+       /*
+        * Ensure the device is not open and nothing further can open it.
+        */
+       r = dm_lock_for_deletion(md);
+       if (r) {
+               DMWARN("unable to remove open device %s", hc->name);
+               up_write(&_hash_lock);
+               dm_put(md);
+               return r;
+       }
+
        __hash_remove(hc);
        up_write(&_hash_lock);
        dm_put(md);