diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-13 01:08:30 +0200 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-05-19 20:25:05 +0200 |
| commit | 13143d2d1cffd243a6d778000b02ab4938ac751a (patch) | |
| tree | 223cf7b9a80b5803af1a88d83868fa357ab96866 /drivers/block | |
| parent | ceph: check return value for start_request in writepages (diff) | |
| download | linux-13143d2d1cffd243a6d778000b02ab4938ac751a.tar.xz linux-13143d2d1cffd243a6d778000b02ab4938ac751a.zip | |
rbd: warn on update_snaps failure on notify
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/rbd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 9712fad82bc6..78d0011a7556 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); } |