Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fix from Sage Weil:
"This fixes a corner case for cloned RBD images"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: handle parent_overlap on writes correctly
+9
-1
+9
-1
drivers/block/rbd.c
+9
-1
drivers/block/rbd.c
···
1431
1431
return test_bit(OBJ_REQ_EXISTS, &obj_request->flags) != 0;
1432
1432
}
1433
1433
1434
+
static bool obj_request_overlaps_parent(struct rbd_obj_request *obj_request)
1435
+
{
1436
+
struct rbd_device *rbd_dev = obj_request->img_request->rbd_dev;
1437
+
1438
+
return obj_request->img_offset <
1439
+
round_up(rbd_dev->parent_overlap, rbd_obj_bytes(&rbd_dev->header));
1440
+
}
1441
+
1434
1442
static void rbd_obj_request_get(struct rbd_obj_request *obj_request)
1435
1443
{
1436
1444
dout("%s: obj %p (was %d)\n", __func__, obj_request,
···
2756
2748
*/
2757
2749
if (!img_request_write_test(img_request) ||
2758
2750
!img_request_layered_test(img_request) ||
2759
-
rbd_dev->parent_overlap <= obj_request->img_offset ||
2751
+
!obj_request_overlaps_parent(obj_request) ||
2760
2752
((known = obj_request_known_test(obj_request)) &&
2761
2753
obj_request_exists_test(obj_request))) {
2762
2754