lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 164/171] ceph: Fix infinite loop in __wake_requests
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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


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

    __wake_requests() will enter infinite loop if we use it to wake
    requests in the session->s_waiting list. __wake_requests() deletes
    requests from the list and __do_request() adds requests back to
    the list.

    Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
    Signed-off-by: Sage Weil <sage@inktank.com>
    (cherry picked from commit ed75ec2cd19b47efcd292b6e23f58e56f4c5bc34)
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/ceph/mds_client.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/fs/ceph/mds_client.c
    +++ b/fs/ceph/mds_client.c
    @@ -1886,9 +1886,14 @@ finish:
    static void __wake_requests(struct ceph_mds_client *mdsc,
    struct list_head *head)
    {
    - struct ceph_mds_request *req, *nreq;
    + struct ceph_mds_request *req;
    + LIST_HEAD(tmp_list);

    - list_for_each_entry_safe(req, nreq, head, r_wait) {
    + list_splice_init(head, &tmp_list);
    +
    + while (!list_empty(&tmp_list)) {
    + req = list_entry(tmp_list.next,
    + struct ceph_mds_request, r_wait);
    list_del_init(&req->r_wait);
    __do_request(mdsc, req);
    }



    \
     
     \ /
      Last update: 2013-01-16 01:21    [W:4.338 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site