From patchwork Mon Mar 13 20:32:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ednadolski@gmail.com X-Patchwork-Id: 9622061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2174460492 for ; Mon, 13 Mar 2017 20:31:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12AD028426 for ; Mon, 13 Mar 2017 20:31:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 075DA284CE; Mon, 13 Mar 2017 20:31:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A506828426 for ; Mon, 13 Mar 2017 20:31:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753317AbdCMUb3 (ORCPT ); Mon, 13 Mar 2017 16:31:29 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33802 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752270AbdCMUb2 (ORCPT ); Mon, 13 Mar 2017 16:31:28 -0400 Received: by mail-wm0-f66.google.com with SMTP id u132so11768355wmg.1 for ; Mon, 13 Mar 2017 13:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oa33K1P2tnO4MSHERVX+j1JXJnXYjBTEX/sRQBnR6jY=; b=P7feXsSA0NbntuIPtTaEHRTXMAR9zj0DfuegM6aTe2uhPMtW2CXBg7+kODHkbfZq+Q Dxx+H10dl1ecR7U/oXzkSpYEI+iN+WycNAD2v38ZJ3JAhbQMgQa3FvD7ZoD68TGRB9HS 3aEMfScOfVbsdhBQvkI6NL7AYwNsgwnorgjHD3fu5ldayEoPIIs6VK4n8DH6nDDeQFaN RaJA/o9pjZWXBfyXS225MytrDbjgVf889oYQC/6AR7RCZcMWIwpwoiYw2l8B5tOyQ5hA p1ukAIHO/RMSLBMbWukuKQz47EivhSzIvSr+HGNoNd85FSjh/EShE3meHGiWIt+nLxhN KF3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oa33K1P2tnO4MSHERVX+j1JXJnXYjBTEX/sRQBnR6jY=; b=a0gJ1CVqAlFelJq0GW/T8gh1b6GfvliexUAA28yvXMbOWgeS7R2s2pCM2DUB3BP6Kk jEKSidfSQWoCXFOrc1pzszlLpGRSNB8AgIM/Xj/4//+oIh69b4WrjMZPPZsesRofSHsx 5TF/dkGZU+CNVxSihGd05RVfIcHgq7xfgbBqpNUV3T9LaAuOWDwkBIFADaXproptOxa2 8goE+jqg8AyIbxJMYd5MJkQkhYLz9HkQPpwc9Urct8p20jqlh2+JPxZIT/tLgvQDA8YW KjgJEz1BRjqPNE8GvxKnsBuX68TnRxKkgfqeWu0ifjeha/HFIo9UaESMJtEyZHTxw2P0 v85Q== X-Gm-Message-State: AFeK/H29PxYZX1+pDqFxxcWVu31jONNZnV2HrmWxTri8lqLlajVR07x8Ek3kBlzsFfUEog== X-Received: by 10.28.19.78 with SMTP id 75mr12729256wmt.108.1489437086196; Mon, 13 Mar 2017 13:31:26 -0700 (PDT) Received: from linux-mf65.suse.de (97-124-166-208.hlrn.qwest.net. [97.124.166.208]) by smtp.gmail.com with ESMTPSA id m201sm12678088wmd.19.2017.03.13.13.31.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Mar 2017 13:31:25 -0700 (PDT) From: ednadolski@gmail.com X-Google-Original-From: enadolski@suse.com To: linux-btrfs@vger.kernel.org Cc: Edmund Nadolski Subject: [PATCH 1/2] btrfs: provide enumeration for __merge_refs mode argument Date: Mon, 13 Mar 2017 14:32:03 -0600 Message-Id: <20170313203204.11857-2-enadolski@suse.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170313203204.11857-1-enadolski@suse.com> References: <20170313203204.11857-1-enadolski@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Edmund Nadolski Replace hardcoded numeric values for __merge_refs 'mode' argument with descriptive constants. Signed-off-by: Edmund Nadolski Reviewed-by: Jeff Mahoney --- fs/btrfs/backref.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 7699e16..e794b6e 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -26,6 +26,11 @@ #include "delayed-ref.h" #include "locking.h" +enum merge_mode { + MERGE_IDENTICAL_KEYS = 1, + MERGE_IDENTICAL_PARENTS, +}; + /* Just an arbitrary number so we can be sure this happened */ #define BACKREF_FOUND_SHARED 6 @@ -809,14 +814,12 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, /* * merge backrefs and adjust counts accordingly * - * mode = 1: merge identical keys, if key is set * FIXME: if we add more keys in __add_prelim_ref, we can merge more here. * additionally, we could even add a key range for the blocks we * looked into to merge even more (-> replace unresolved refs by those * having a parent). - * mode = 2: merge identical parents */ -static void __merge_refs(struct list_head *head, int mode) +static void __merge_refs(struct list_head *head, enum merge_mode mode) { struct __prelim_ref *pos1; @@ -829,7 +832,7 @@ static void __merge_refs(struct list_head *head, int mode) if (!ref_for_same_block(ref1, ref2)) continue; - if (mode == 1) { + if (mode == MERGE_IDENTICAL_KEYS) { if (!ref1->parent && ref2->parent) swap(ref1, ref2); } else { @@ -1374,7 +1377,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, if (ret) goto out; - __merge_refs(&prefs, 1); + __merge_refs(&prefs, MERGE_IDENTICAL_KEYS); ret = __resolve_indirect_refs(fs_info, path, time_seq, &prefs, extent_item_pos, total_refs, @@ -1382,7 +1385,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, if (ret) goto out; - __merge_refs(&prefs, 2); + __merge_refs(&prefs, MERGE_IDENTICAL_PARENTS); while (!list_empty(&prefs)) { ref = list_first_entry(&prefs, struct __prelim_ref, list);