lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 105/129] ceph: Add check returned value on func ceph_calc_ceph_pg.
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: majianpeng <majianpeng@gmail.com>

    commit 2fbcbff1d6b9243ef71c64a8ab993bc3c7bb7af1 upstream.

    Func ceph_calc_ceph_pg maybe failed.So add check for returned value.

    Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
    Reviewed-by: Sage Weil <sage@inktank.com>
    Signed-off-by: Sage Weil <sage@inktank.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ceph/ioctl.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/fs/ceph/ioctl.c
    +++ b/fs/ceph/ioctl.c
    @@ -211,8 +211,12 @@ static long ceph_ioctl_get_dataloc(struc
    snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
    ceph_ino(inode), dl.object_no);

    - ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
    - ceph_file_layout_pg_pool(ci->i_layout));
    + r = ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
    + ceph_file_layout_pg_pool(ci->i_layout));
    + if (r < 0) {
    + up_read(&osdc->map_sem);
    + return r;
    + }

    dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
    if (dl.osd >= 0) {



    \
     
     \ /
      Last update: 2014-01-07 03:41    [W:4.143 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site