X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmd%2Fdm-snap.c;h=b84bc1aae35316ab6ec1b1190bc9d5f5370224b8;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=6578b260feab39e883dddb885707c1a53032f922;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 6578b260f..b84bc1aae 100644
--- 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;
 	}