diff options
author | Jan Kara <jack@suse.cz> | 2014-10-22 03:17:24 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@redhat.com> | 2014-10-30 06:11:51 -0400 |
commit | a8d4205623ae965e36c68629db306ca0695a2771 (patch) | |
tree | 71dbbf025b9b73f4788c229f6a3311c0834ea239 | |
parent | 89baaa570ab0b476db09408d209578cfed700e9f (diff) |
rbd: Fix error recovery in rbd_obj_read_sync()
When we fail to allocate page vector in rbd_obj_read_sync() we just
basically ignore the problem and continue which will result in an oops
later. Fix the problem by returning proper error.
CC: Yehuda Sadeh <yehuda@inktank.com>
CC: Sage Weil <sage@inktank.com>
CC: ceph-devel@vger.kernel.org
CC: stable@vger.kernel.org
Coverity-id: 1226882
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
-rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index be8d44af6ae1..27b71a0b72d0 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -3533,7 +3533,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev, | |||
3533 | page_count = (u32) calc_pages_for(offset, length); | 3533 | page_count = (u32) calc_pages_for(offset, length); |
3534 | pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); | 3534 | pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); |
3535 | if (IS_ERR(pages)) | 3535 | if (IS_ERR(pages)) |
3536 | ret = PTR_ERR(pages); | 3536 | return PTR_ERR(pages); |
3537 | 3537 | ||
3538 | ret = -ENOMEM; | 3538 | ret = -ENOMEM; |
3539 | obj_request = rbd_obj_request_create(object_name, offset, length, | 3539 | obj_request = rbd_obj_request_create(object_name, offset, length, |