Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / md / dm-snap.c

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 6578b26..b84bc1a 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/blkdev.h>
+#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/device-mapper.h>
 #include <linux/fs.h>
@@ -22,8 +23,6 @@
 #include "dm-bio-list.h"
 #include "kcopyd.h"
 
-#define DM_MSG_PREFIX "snapshots"
-
 /*
  * The percentage increment we will wake up users at
  */
@@ -118,7 +117,7 @@ static int init_origin_hash(void)
        _origins = kmalloc(ORIGIN_HASH_SIZE * sizeof(struct list_head),
                           GFP_KERNEL);
        if (!_origins) {
-               DMERR("unable to allocate memory");
+               DMERR("Device mapper: Snapshot: unable to allocate memory");
                return -ENOMEM;
        }
 
@@ -413,7 +412,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        int blocksize;
 
        if (argc < 4) {
-               ti->error = "requires exactly 4 arguments";
+               ti->error = "dm-snapshot: requires exactly 4 arguments";
                r = -EINVAL;
                goto bad1;
        }
@@ -691,7 +690,6 @@ static void pending_complete(struct pending_exception *pe, int success)
 
                free_exception(e);
 
-               remove_exception(&pe->e);
                error_snapshot_bios(pe);
                goto out;
        }
@@ -1129,7 +1127,7 @@ static int origin_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        struct dm_dev *dev;
 
        if (argc != 1) {
-               ti->error = "origin: incorrect number of arguments";
+               ti->error = "dm-origin: incorrect number of arguments";
                return -EINVAL;
        }
 
@@ -1238,7 +1236,7 @@ static int __init dm_snapshot_init(void)
 
        r = dm_register_target(&origin_target);
        if (r < 0) {
-               DMERR("Origin target register failed %d", r);
+               DMERR("Device mapper: Origin: register failed %d\n", r);
                goto bad1;
        }