* [PATCH] rbd: don't put snap_context twice in rbd_queue_workfn()
@ 2015-12-01 20:04 Ilya Dryomov
2015-12-01 21:04 ` Josh Durgin
0 siblings, 1 reply; 2+ messages in thread
From: Ilya Dryomov @ 2015-12-01 20:04 UTC (permalink / raw)
To: ceph-devel; +Cc: Josh Durgin
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.
Cc: stable@vger.kernel.org # 3.18+
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
drivers/block/rbd.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 24a757e97d56..4a876785b68c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3442,6 +3442,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,
--
2.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rbd: don't put snap_context twice in rbd_queue_workfn()
2015-12-01 20:04 [PATCH] rbd: don't put snap_context twice in rbd_queue_workfn() Ilya Dryomov
@ 2015-12-01 21:04 ` Josh Durgin
0 siblings, 0 replies; 2+ messages in thread
From: Josh Durgin @ 2015-12-01 21:04 UTC (permalink / raw)
To: Ilya Dryomov, ceph-devel
On 12/01/2015 12:04 PM, Ilya Dryomov wrote:
> 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.
>
> Cc: stable@vger.kernel.org # 3.18+
> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Whoops!
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
> drivers/block/rbd.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 24a757e97d56..4a876785b68c 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -3442,6 +3442,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,
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-01 21:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-01 20:04 [PATCH] rbd: don't put snap_context twice in rbd_queue_workfn() Ilya Dryomov
2015-12-01 21:04 ` Josh Durgin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.