diff options
| author | Jan Kara <jack@suse.cz> | 2014-10-22 09:17:24 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-14 15:19:54 +0000 |
| commit | c71e0efe1eeb425d5c5c21f491455522737b3e2c (patch) | |
| tree | c4d0a5453206f333b056b47431f2ea83b7214444 /drivers/block | |
| parent | 71d7c1ce93068d99d95cc5484d55ad84041631d5 (diff) | |
| download | linux-stable-c71e0efe1eeb425d5c5c21f491455522737b3e2c.tar.gz linux-stable-c71e0efe1eeb425d5c5c21f491455522737b3e2c.tar.bz2 linux-stable-c71e0efe1eeb425d5c5c21f491455522737b3e2c.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: Luis Henriques <luis.henriques@canonical.com>
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 9dc02c429771..a15500662f4c 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3389,7 +3389,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, |