diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-11-27 19:23:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 21:25:42 -0800 |
| commit | 587de47c5adfd7a13d2f239bd7ad88a31be2b21c (patch) | |
| tree | 983915eeff934a9c15dce731e4221ac8387a3c1a | |
| parent | cf7c570bb1a1519ed9a75b4feddc04ab72dd9856 (diff) | |
rbd: don't put snap_context twice in rbd_queue_workfn()
commit 70b16db86f564977df074072143284aec2cb1162 upstream.
Commit 4e752f0ab0e8 ("rbd: access snapshot context and mapping size
safely") moved ceph_get_snap_context() out of rbd_img_request_create()
and into rbd_queue_workfn(), adding a ceph_put_snap_context() to the
error path in rbd_queue_workfn(). However, rbd_img_request_create()
consumes a ref on snapc, so calling ceph_put_snap_context() after
a successful rbd_img_request_create() leads to an extra put. Fix it.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/block/rbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 017b7d58ae06..55f8a6a706fc 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3439,6 +3439,7 @@ static void rbd_queue_workfn(struct work_struct *work) goto err_rq; } img_request->rq = rq; + snapc = NULL; /* img_request consumes a ref */ if (op_type == OBJ_OP_DISCARD) result = rbd_img_request_fill(img_request, OBJ_REQUEST_NODATA, |