Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-06-10 14:21:40 +0200
committerTakashi Iwai <tiwai@suse.de>2016-06-10 14:21:40 +0200
commitaa44e39144ad22d60ba0ffd229b9afe797496ff8 (patch)
treebc04ff0c0a67085c87f51b48b2d7f5fe2e2d2b79
parent2da069c2b2f0860196d0e8fece42f184dcaecf4c (diff)
parentd915b305288b347f76147b9a57bcb53c438a18ab (diff)
Merge branch 'users/ddiss/SLE12-SP2/for-next' into SLE12-SP2rpm-4.4.13-44
Pull rbd fix from David Disseldorp. suse-commit: 28b7a48b726dd1c8084ab72407cc39b389f8e692
-rw-r--r--drivers/block/rbd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7a124c46e592..ea548dd9a67e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2710,7 +2710,8 @@ rbd_osd_copyup_callback(struct rbd_obj_request *obj_request)
dout("%s: obj %p\n", __func__, obj_request);
rbd_assert(obj_request->type == OBJ_REQUEST_BIO ||
- obj_request->type == OBJ_REQUEST_NODATA);
+ obj_request->type == OBJ_REQUEST_NODATA ||
+ obj_request->type == OBJ_REQUEST_SG);
rbd_assert(obj_request_img_data_test(obj_request));
img_request = obj_request->img_request;
rbd_assert(img_request);