| From a8d4205623ae965e36c68629db306ca0695a2771 Mon Sep 17 00:00:00 2001 |
| From: Jan Kara <jack@suse.cz> |
| Date: Wed, 22 Oct 2014 09:17:24 +0200 |
| Subject: rbd: Fix error recovery in rbd_obj_read_sync() |
| |
| From: Jan Kara <jack@suse.cz> |
| |
| commit a8d4205623ae965e36c68629db306ca0695a2771 upstream. |
| |
| 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 |
| Coverity-id: 1226882 |
| Signed-off-by: Jan Kara <jack@suse.cz> |
| Signed-off-by: Ilya Dryomov <idryomov@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/block/rbd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/block/rbd.c |
| +++ b/drivers/block/rbd.c |
| @@ -3382,7 +3382,7 @@ static int rbd_obj_read_sync(struct rbd_ |
| page_count = (u32) calc_pages_for(offset, length); |
| pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); |
| if (IS_ERR(pages)) |
| - ret = PTR_ERR(pages); |
| + return PTR_ERR(pages); |
| |
| ret = -ENOMEM; |
| obj_request = rbd_obj_request_create(object_name, offset, length, |
