From patchwork Thu Jan 3 19:02:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1929141 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 99F903FE37 for ; Thu, 3 Jan 2013 19:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753870Ab3ACTDD (ORCPT ); Thu, 3 Jan 2013 14:03:03 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:44927 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753698Ab3ACTDC (ORCPT ); Thu, 3 Jan 2013 14:03:02 -0500 Received: by mail-ie0-f181.google.com with SMTP id 16so18494129iea.26 for ; Thu, 03 Jan 2013 11:03:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=Ayz3UtU6115Sh43y3QK7FPlBbtByEVU1n9IcD257M1Q=; b=E/SX4+Lij7eGuX4bBDBZW3rbGacA2ey9SycDOmpMwJ7+7Sg/qHuEbo1YxjnMuVWQsz 2lBlWYVRler8pNJ1sJBrxijbz/RL6Af3BD8rnJumXwuIXPBOsnE79ZKHl62xhKBFQBZL 2SbjIEvkdnIXdiZ/MWlPExCHQTjhYrx5A5ZXEphE7DiNZ+xPdBeLjoN1fgeC+QyYKvYL 3YJvAgsIqB+hzFE9DAJ/X806W/TC/hdjJTxWgbX0ySeOioDxAWe7GLS3ullxofSl0TTi OLfPchTi7yKK5xOtdfaF9q1aNAnd839nlR1CSwmul/baaYIPeRelpoGmJUaAoiQGzi3n +mmQ== X-Received: by 10.50.178.106 with SMTP id cx10mr44870092igc.24.1357239781621; Thu, 03 Jan 2013 11:03:01 -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 gs6sm41762380igc.11.2013.01.03.11.02.59 (version=SSLv3 cipher=OTHER); Thu, 03 Jan 2013 11:03:00 -0800 (PST) Message-ID: <50E5D5E3.1080306@inktank.com> Date: Thu, 03 Jan 2013 13:02:59 -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 REPOST] libceph: reformat __reset_osd() X-Gm-Message-State: ALoCoQkQPRYro4q23JjqkVewS55p0/c/z0NJoCjRzWfrn1EDrFrtCv5oG4LVnsrtOA5aGGgs3D2Z Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Reformat __reset_osd() into three distinct blocks of code handling the three return cases. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- net/ceph/osd_client.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) static void __insert_osd(struct ceph_osd_client *osdc, struct ceph_osd *new) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index eb9a444..5f9f65a 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -739,31 +739,36 @@ static void remove_old_osds(struct ceph_osd_client *osdc) */ static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) { - struct ceph_osd_request *req; - int ret = 0; + struct ceph_entity_addr *peer_addr; dout("__reset_osd %p osd%d\n", osd, osd->o_osd); if (list_empty(&osd->o_requests) && list_empty(&osd->o_linger_requests)) { __remove_osd(osdc, osd); - ret = -ENODEV; - } else if (memcmp(&osdc->osdmap->osd_addr[osd->o_osd], - &osd->o_con.peer_addr, - sizeof(osd->o_con.peer_addr)) == 0 && - !ceph_con_opened(&osd->o_con)) { + + return -ENODEV; + } + + peer_addr = &osdc->osdmap->osd_addr[osd->o_osd]; + if (!memcmp(peer_addr, &osd->o_con.peer_addr, sizeof (*peer_addr)) && + !ceph_con_opened(&osd->o_con)) { + struct ceph_osd_request *req; + dout(" osd addr hasn't changed and connection never opened," " letting msgr retry"); /* touch each r_stamp for handle_timeout()'s benfit */ list_for_each_entry(req, &osd->o_requests, r_osd_item) req->r_stamp = jiffies; - ret = -EAGAIN; - } else { - ceph_con_close(&osd->o_con); - ceph_con_open(&osd->o_con, CEPH_ENTITY_TYPE_OSD, osd->o_osd, - &osdc->osdmap->osd_addr[osd->o_osd]); - osd->o_incarnation++; + + return -EAGAIN; } - return ret; + + ceph_con_close(&osd->o_con); + ceph_con_open(&osd->o_con, CEPH_ENTITY_TYPE_OSD, osd->o_osd, + &osdc->osdmap->osd_addr[osd->o_osd]); + osd->o_incarnation++; + + return 0; }