From patchwork Thu Sep 11 07:22:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 4882421 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A4E29F32E for ; Thu, 11 Sep 2014 07:23:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4B6A20220 for ; Thu, 11 Sep 2014 07:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E45032024F for ; Thu, 11 Sep 2014 07:23:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbaIKHW6 (ORCPT ); Thu, 11 Sep 2014 03:22:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63364 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752671AbaIKHW5 (ORCPT ); Thu, 11 Sep 2014 03:22:57 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8B7MtkX032746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 11 Sep 2014 03:22:55 -0400 Received: from localhost.localdomain (vpn1-112-35.nay.redhat.com [10.66.112.35]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8B7MkAO031064; Thu, 11 Sep 2014 03:22:52 -0400 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org Cc: "Yan, Zheng" , "Yan, Zheng" Subject: [PATCH 2/2] ceph: make sure request isn't in any waiting list when kicking request. Date: Thu, 11 Sep 2014 15:22:36 +0800 Message-Id: <1410420156-3289-2-git-send-email-zyan@redhat.com> In-Reply-To: <1410420156-3289-1-git-send-email-zyan@redhat.com> References: <1410420156-3289-1-git-send-email-zyan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Yan, Zheng" we may corrupt waiting list if a request in the waiting list is kicked. Signed-off-by: Yan, Zheng Reviewed-by: Sage Weil --- fs/ceph/mds_client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 267ba44..a17fc49 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2078,6 +2078,7 @@ static void kick_requests(struct ceph_mds_client *mdsc, int mds) if (req->r_session && req->r_session->s_mds == mds) { dout(" kicking tid %llu\n", req->r_tid); + list_del_init(&req->r_wait); __do_request(mdsc, req); } }