From patchwork Mon Dec 10 00:35:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1854921 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 33566DF230 for ; Mon, 10 Dec 2012 00:41:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580Ab2LJAlF (ORCPT ); Sun, 9 Dec 2012 19:41:05 -0500 Received: from mail-ia0-f172.google.com ([209.85.210.172]:58099 "EHLO mail-ia0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443Ab2LJAlE (ORCPT ); Sun, 9 Dec 2012 19:41:04 -0500 X-Greylist: delayed 307 seconds by postgrey-1.27 at vger.kernel.org; Sun, 09 Dec 2012 19:41:04 EST Received: by mail-ia0-f172.google.com with SMTP id z13so3355285iaz.3 for ; Sun, 09 Dec 2012 16:41:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=EcIJvwVcBM0zQ1YevFDSCVJ+o4qBupn0JJNvrwgcjGk=; b=g5DfUppAQ4UNnkH7dVGzO1rKqbLsdHvstZR758Au/vkj4zw8OcopHlgBbpyMn1JoKZ 3E7vwJqqOWHZw+zjF6p8FqRcfPQv6LAl4bZxh4zCkqFzrEvw0IEl1iQsnzVpMaEN03Au bCnpVg2IOXMrEBbsheuxyk9apcvFanh0CRB8NXHpBgGz0NaO9N3mjK4LdDDHAFfumX2f 3WjBY/+tcOFHRiUPuDLbjTwyn0fImBsDia/J7HmPrkSUhj1cbeJRT8l7WEfrAy9e1tjf GdJJUttJBu+rx8oeMj7v0ryf9XOaqs67gbz6DCJ+BWTfiPTCMZvYNrHDfuQFL1MLCgso rWBA== Received: by 10.50.185.166 with SMTP id fd6mr4984946igc.62.1355099757307; Sun, 09 Dec 2012 16:35:57 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id hg2sm4773064igc.3.2012.12.09.16.35.55 (version=SSLv3 cipher=OTHER); Sun, 09 Dec 2012 16:35:56 -0800 (PST) Message-ID: <50C52E6A.4070309@inktank.com> Date: Sun, 09 Dec 2012 18:35:54 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH 2/4] libceph: register request before unregister linger References: <50C52DE5.9070602@inktank.com> In-Reply-To: <50C52DE5.9070602@inktank.com> X-Gm-Message-State: ALoCoQlErixAKI0YADBgJ3KnojnJL9bS4mX+P6j7LJi3S+JQjyBjCIatjgeutYbSK6Q+I8TV6Bh5 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org In kick_requests(), we need to register the request before we unregister the linger request. Otherwise the unregister will reset the request's osd pointer to NULL. Signed-off-by: Alex Elder --- net/ceph/osd_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 79a071b..1a42701 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1253,8 +1253,8 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend) dout("kicking lingering %p tid %llu osd%d\n", req, req->r_tid, req->r_osd ? req->r_osd->o_osd : -1); - __unregister_linger_request(osdc, req); __register_request(osdc, req); + __unregister_linger_request(osdc, req); } mutex_unlock(&osdc->request_mutex);