diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-30 02:00:27 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-30 02:00:27 +0400 |
| commit | 0f2776e6151a123552fd06b666fe755fa780a967 (patch) | |
| tree | 57afca1fa00e0c21697e3acdcccd7ed7c544ef77 | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 (diff) | |
| parent | 638c323c4d1f8eaf25224946e21ce8818f1bcee1 (diff) | |
| download | linux-0f2776e6151a123552fd06b666fe755fa780a967.tar.xz | |
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
| -rw-r--r-- | drivers/block/rbd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b365e0dfccb6..34898d53395b 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -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(which != BAD_WHICH); rbd_assert(which < img_request->obj_request_count); - rbd_assert(which >= img_request->next_completion); spin_lock_irq(&img_request->completion_lock); if (which != img_request->next_completion) |