Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f2776e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

Pull Ceph fix from Sage Weil:
 "This drops a bad assert that a few users have been hitting but we've
  only recently been able to track down"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: drop an unsafe assertion
parents 49d8137a 638c323c

drivers/block/rbd.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2109,7 +2109,6 @@ static void rbd_img_obj_callback(struct rbd_obj_request *obj_request) 
	rbd_assert(img_request->obj_request_count > 0);

	rbd_assert(img_request->obj_request_count > 0);

	rbd_assert(which != BAD_WHICH);

	rbd_assert(which != BAD_WHICH);

	rbd_assert(which < img_request->obj_request_count);

	rbd_assert(which < img_request->obj_request_count);

	rbd_assert(which >= img_request->next_completion);





	spin_lock_irq(&img_request->completion_lock);

	spin_lock_irq(&img_request->completion_lock);

	if (which != img_request->next_completion)

	if (which != img_request->next_completion)