From 0a90d2de4ae7191081794660bdeff76f2d45d793 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Fri, 16 Oct 2009 23:18:16 +0100
Subject: [PATCH] --- yaml --- r: 167667 b: refs/heads/master c:
 3f2412dc85260e5aae7ebb03bf50d5b1407e3083 h: refs/heads/master i:   167665:
 6f2a671af6b49796ba65b05979b629d6789f5863   167663:
 c0c4c347f2ab5e159a51159586aad0c49699ee69 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/md/dm-snap.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99e5fa1871b7..d5c8d19082e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f88fb981183e71daf40bbd84bc8251bbf7b59e19
+refs/heads/master: 3f2412dc85260e5aae7ebb03bf50d5b1407e3083
diff --git a/trunk/drivers/md/dm-snap.c b/trunk/drivers/md/dm-snap.c
index 53f4063f7ea4..9cb392b3e920 100644
--- a/trunk/drivers/md/dm-snap.c
+++ b/trunk/drivers/md/dm-snap.c
@@ -673,6 +673,11 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 	bio_list_init(&s->queued_bios);
 	INIT_WORK(&s->queued_bios_work, flush_queued_bios);
 
+	if (!s->store->chunk_size) {
+		ti->error = "Chunk size not set";
+		goto bad_load_and_register;
+	}
+
 	/* Add snapshot to the list of snapshots for this origin */
 	/* Exceptions aren't triggered till snapshot_resume() is called */
 	if (register_snapshot(s)) {