From patchwork Thu Mar 27 18:18:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3899291 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 B846A9F2E8 for ; Thu, 27 Mar 2014 18:19:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E317A20253 for ; Thu, 27 Mar 2014 18:19:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DFCF20225 for ; Thu, 27 Mar 2014 18:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757140AbaC0STM (ORCPT ); Thu, 27 Mar 2014 14:19:12 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:52088 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757121AbaC0STK (ORCPT ); Thu, 27 Mar 2014 14:19:10 -0400 Received: by mail-ee0-f49.google.com with SMTP id c41so3203227eek.8 for ; Thu, 27 Mar 2014 11:19:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=poKdxmgWjVJghn8J9h0w349Jj6rAgjyG412NsElC6bs=; b=QYGri7SEmQDfQlwYNBtHTS/9kda8kJ12FNrEryaeGBNYPrMyKdm2ijyZhWzdg6DrI8 PvD56KJ27jwJl5XCm+o6mQ8kQXqZu0aqZLwIPXgSKK+cQSmh4V70ADJDdFeAY/HlX/xC R3U7jukVu4xzSykTQNVNJVycn+z7tJBqUPVbI1FkNrqY3yvuhatsB9kFrqokQfi17i0y n6is0DRYmU47aJlcmm57weMchwVWjeeeG6aNNyjzSWDxEbMVCjGQpDJQzMd3S/tgCBsN kbyjfL4CpICV8/rBXsQ8Dvby9mKN4CpwGRJ8qpqzUVd+DGdmYy5frzAZGIQkyxWXktjb S/pw== X-Gm-Message-State: ALoCoQnTwbxiZMPMB0E2k4bTrukmGL1VoEa54FOB/oyjsCjpH9ruGEKfRr4c7HLC1c1ZHyUY2kL5 X-Received: by 10.15.36.6 with SMTP id h6mr2527556eev.54.1395944349173; Thu, 27 Mar 2014 11:19:09 -0700 (PDT) Received: from localhost ([109.110.66.7]) by mx.google.com with ESMTPSA id h47sm5980735eey.13.2014.03.27.11.19.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Mar 2014 11:19:08 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 20/33] libceph: primary_temp decode bits Date: Thu, 27 Mar 2014 20:18:06 +0200 Message-Id: <1395944299-21970-21-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> References: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add a common helper to decode both primary_temp (full map, map) and new_primary_temp (inc map, same) and switch to it. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- net/ceph/osdmap.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index d78c3e5d60f7..0ca7f36e88b4 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -857,6 +857,61 @@ static int decode_new_pg_temp(void **p, void *end, struct ceph_osdmap *map) return __decode_pg_temp(p, end, map, true); } +static int __decode_primary_temp(void **p, void *end, struct ceph_osdmap *map, + bool incremental) +{ + u32 n; + + ceph_decode_32_safe(p, end, n, e_inval); + while (n--) { + struct ceph_pg pgid; + u32 osd; + int ret; + + ret = ceph_decode_pgid(p, end, &pgid); + if (ret) + return ret; + + ceph_decode_32_safe(p, end, osd, e_inval); + + ret = __remove_pg_mapping(&map->primary_temp, pgid); + BUG_ON(!incremental && ret != -ENOENT); + + if (!incremental || osd != (u32)-1) { + struct ceph_pg_mapping *pg; + + pg = kzalloc(sizeof(*pg), GFP_NOFS); + if (!pg) + return -ENOMEM; + + pg->pgid = pgid; + pg->primary_temp.osd = osd; + + ret = __insert_pg_mapping(pg, &map->primary_temp); + if (ret) { + kfree(pg); + return ret; + } + } + } + + return 0; + +e_inval: + return -EINVAL; +} + +static int decode_primary_temp(void **p, void *end, struct ceph_osdmap *map) +{ + return __decode_primary_temp(p, end, map, false); +} + +static int decode_new_primary_temp(void **p, void *end, + struct ceph_osdmap *map) +{ + return __decode_primary_temp(p, end, map, true); +} + /* * decode a full map. */ @@ -927,6 +982,13 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) if (err) goto bad; + /* primary_temp */ + if (struct_v >= 1) { + err = decode_primary_temp(p, end, map); + if (err) + goto bad; + } + /* crush */ ceph_decode_32_safe(p, end, len, e_inval); map->crush = crush_decode(*p, min(*p + len, end)); @@ -1127,6 +1189,13 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, if (err) goto bad; + /* new_primary_temp */ + if (struct_v >= 1) { + err = decode_new_primary_temp(p, end, map); + if (err) + goto bad; + } + /* ignore the rest */ *p = end;