From cc1eaa3fce9270c71d7a07273361c043dda6c146 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 12 May 2011 16:08:30 -0700
Subject: [PATCH] --- yaml --- r: 251313 b: refs/heads/master c:
 13143d2d1cffd243a6d778000b02ab4938ac751a h: refs/heads/master i:   251311:
 352a7149c87d9dc19e92be256b98d3c1dcf33c01 v: v3

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

diff --git a/[refs] b/[refs]
index af558257435e..ff375a630617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d6fcb081a4770c3772c51c59c7251c22716d7bb
+refs/heads/master: 13143d2d1cffd243a6d778000b02ab4938ac751a
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 9712fad82bc6..78d0011a7556 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1191,14 +1191,19 @@ static int rbd_req_sync_notify_ack(struct rbd_device *dev,
 static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
 {
 	struct rbd_device *dev = (struct rbd_device *)data;
+	int rc;
+
 	if (!dev)
 		return;
 
 	dout("rbd_watch_cb %s notify_id=%lld opcode=%d\n", dev->obj_md_name,
 		notify_id, (int)opcode);
 	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
-	__rbd_update_snaps(dev);
+	rc = __rbd_update_snaps(dev);
 	mutex_unlock(&ctl_mutex);
+	if (rc)
+		pr_warning(DRV_NAME "%d got notification but failed to update"
+			   " snaps: %d\n", dev->major, rc);
 
 	rbd_req_sync_notify_ack(dev, ver, notify_id, dev->obj_md_name);
 }