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 097/129] libceph: fix safe completion
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: "Yan, Zheng" <zheng.z.yan@intel.com>

    commit eb845ff13a44477f8a411baedbf11d678b9daf0a upstream.

    handle_reply() calls complete_request() only if the first OSD reply
    has ONDISK flag.

    Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
    Reviewed-by: Sage Weil <sage@inktank.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/ceph/osd_client.h | 1 -
    net/ceph/osd_client.c | 17 ++++++++---------
    2 files changed, 8 insertions(+), 10 deletions(-)

    --- a/include/linux/ceph/osd_client.h
    +++ b/include/linux/ceph/osd_client.h
    @@ -145,7 +145,6 @@ struct ceph_osd_request {
    s32 r_reply_op_result[CEPH_OSD_MAX_OP];
    int r_got_reply;
    int r_linger;
    - int r_completed;

    struct ceph_osd_client *r_osdc;
    struct kref r_kref;
    --- a/net/ceph/osd_client.c
    +++ b/net/ceph/osd_client.c
    @@ -1522,6 +1522,8 @@ static void handle_reply(struct ceph_osd
    for (i = 0; i < numops; i++)
    req->r_reply_op_result[i] = ceph_decode_32(&p);

    + already_completed = req->r_got_reply;
    +
    if (!req->r_got_reply) {

    req->r_result = result;
    @@ -1552,16 +1554,14 @@ static void handle_reply(struct ceph_osd
    ((flags & CEPH_OSD_FLAG_WRITE) == 0))
    __unregister_request(osdc, req);

    - already_completed = req->r_completed;
    - req->r_completed = 1;
    mutex_unlock(&osdc->request_mutex);
    - if (already_completed)
    - goto done;

    - if (req->r_callback)
    - req->r_callback(req, msg);
    - else
    - complete_all(&req->r_completion);
    + if (!already_completed) {
    + if (req->r_callback)
    + req->r_callback(req, msg);
    + else
    + complete_all(&req->r_completion);
    + }

    if (flags & CEPH_OSD_FLAG_ONDISK)
    complete_request(req);
    @@ -2121,7 +2121,6 @@ int ceph_osdc_start_request(struct ceph_
    __register_request(osdc, req);
    req->r_sent = 0;
    req->r_got_reply = 0;
    - req->r_completed = 0;
    rc = __map_request(osdc, req, 0);
    if (rc < 0) {
    if (nofail) {



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