diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:31:37 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:31:37 +0800 |
| commit | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (patch) | |
| tree | be9c6b6f79e17be67ad3b91c0ff9d78ab8759910 /drivers/block/rbd.c | |
| parent | 9fc740e49155dd8d77a7a51f8657825e9aa29826 (diff) | |
| parent | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android
Diffstat (limited to 'drivers/block/rbd.c')
| -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 1ec6441fe2a5..09138ceba046 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3417,6 +3417,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, |