diff options
| author | Jan Kara <jack@suse.cz> | 2014-10-22 09:17:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 09:00:12 -0800 |
| commit | 9b5d484b3846217256cf6b05883ac1469c32eebe (patch) | |
| tree | 4b9bc29f67d05a1a5a20d293a47f6e00c11db4be /drivers/block | |
| parent | 6786b40d31e58fea84f918460db04c5c901e3f42 (diff) | |
| download | lwn-9b5d484b3846217256cf6b05883ac1469c32eebe.tar.gz lwn-9b5d484b3846217256cf6b05883ac1469c32eebe.zip | |
rbd: Fix error recovery in rbd_obj_read_sync()
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>
Diffstat (limited to 'drivers/block')
| -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 7296c7f074bd..255ca232ecc7 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3217,7 +3217,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev, 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, |