summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-12 16:08:30 -0700
committerSage Weil <sage@newdream.net>2011-05-19 11:25:05 -0700
commit13143d2d1cffd243a6d778000b02ab4938ac751a (patch)
tree223cf7b9a80b5803af1a88d83868fa357ab96866
parent9d6fcb081a4770c3772c51c59c7251c22716d7bb (diff)
downloadop-kernel-dev-13143d2d1cffd243a6d778000b02ab4938ac751a.zip
op-kernel-dev-13143d2d1cffd243a6d778000b02ab4938ac751a.tar.gz
rbd: warn on update_snaps failure on notify
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--drivers/block/rbd.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 9712fad..78d0011 100644
--- a/drivers/block/rbd.c
+++ b/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);
}
OpenPOWER on IntegriCloud