From 793dc51b17613f04eb6ee25c6686a660aef83736 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@dreamhost.com>
Date: Wed, 11 Jan 2012 19:42:15 -0800
Subject: [PATCH] --- yaml --- r: 284452 b: refs/heads/master c:
 0e805a1d857799352e51e8697c0b1a30aec16913 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/rbd.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 484470e8a1ac..7b57a3cc6c3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a40dc6cc2e121abcbd1b22583ef5447763df510c
+refs/heads/master: 0e805a1d857799352e51e8697c0b1a30aec16913
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 148ab944378d..3fd31dec8c9c 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -2184,6 +2184,8 @@ static ssize_t rbd_add(struct bus_type *bus,
 	INIT_LIST_HEAD(&rbd_dev->node);
 	INIT_LIST_HEAD(&rbd_dev->snaps);
 
+	init_rwsem(&rbd_dev->header.snap_rwsem);
+
 	/* generate unique id: find highest unique id, add one */
 	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);