From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Tue, 4 Mar 2014 09:57:17 +0000 (+0200)
Subject: rbd: fix error paths in rbd_img_request_fill()
X-Git-Tag: v3.15-rc1~61^2~76
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42dd037c08c7cd6e3e9af7824b0c1d063f838885;p=pandora-kernel.git

rbd: fix error paths in rbd_img_request_fill()

Doing rbd_obj_request_put() in rbd_img_request_fill() error paths is
not only insufficient, but also triggers an rbd_assert() in
rbd_obj_request_destroy():

    Assertion failure in rbd_obj_request_destroy() at line 1867:

    rbd_assert(obj_request->img_request == NULL);

rbd_img_obj_request_add() adds obj_requests to the img_request, the
opposite is rbd_img_obj_request_del().  Use it.

Fixes: http://tracker.ceph.com/issues/7327

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
---

Reading git-diff-tree failed