From patchwork Mon Sep 17 17:31:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 10603231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3CE9B157B for ; Mon, 17 Sep 2018 17:33:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CD0E27F98 for ; Mon, 17 Sep 2018 17:33:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30BA52837D; Mon, 17 Sep 2018 17:33:03 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3A8F2832D for ; Mon, 17 Sep 2018 17:33:02 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 7F1DA9C1041; Mon, 17 Sep 2018 10:31:50 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 00A5921F5D1 for ; Mon, 17 Sep 2018 10:31:24 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id E6EF89EA; Mon, 17 Sep 2018 13:31:23 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id E52482B3; Mon, 17 Sep 2018 13:31:23 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 17 Sep 2018 13:31:13 -0400 Message-Id: <1537205481-6899-1-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 Subject: [lustre-devel] [PATCH 0/8] lustre: obd: preprocessor cleanups X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" X-Virus-Scanned: ClamAV using ClamSMTP The obd.h, obd_class.h, and clio headers are littered with complex macros that are difficult to read. These macros existed to handle the obd stats and md stats which are lacking in the linux client. Newer versions do support md_stats so lets restore them as well as cleanup the ugly macros. This patch set is order dependent and is based on the first batch patch set for lustre 2.10 applied against the lustre-testing branch. Ben Evans (4): lustre: obdclass: remove CL_PAGE_INVOKE et. al. lustre: obdclass: remove cl_for_each defines lustre: obdclass: Code cleanup lustre: obdclass: cleanup obd_class.h defines James Simmons (1): lustre: obdclass: restore md_stats code John L. Hammond (3): lustre: obd: remove obd_{get,put}ref() lustre: obd: remove OBD ops based stats lustre: obd: add md_stats to MDC and LMV devices .../staging/lustre/lustre/include/lprocfs_status.h | 5 +- drivers/staging/lustre/lustre/include/obd.h | 20 +- drivers/staging/lustre/lustre/include/obd_class.h | 788 ++++++++++++--------- drivers/staging/lustre/lustre/llite/file.c | 2 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 3 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 9 +- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 6 + drivers/staging/lustre/lustre/lov/lov_dev.c | 12 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 2 + drivers/staging/lustre/lustre/lov/lov_obd.c | 44 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 10 +- drivers/staging/lustre/lustre/lov/lov_request.c | 4 +- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 7 + drivers/staging/lustre/lustre/mdc/mdc_request.c | 8 +- drivers/staging/lustre/lustre/obdclass/Makefile | 5 +- drivers/staging/lustre/lustre/obdclass/cl_io.c | 26 +- drivers/staging/lustre/lustre/obdclass/cl_object.c | 21 +- drivers/staging/lustre/lustre/obdclass/cl_page.c | 275 +++---- drivers/staging/lustre/lustre/obdclass/class_obd.c | 1 - drivers/staging/lustre/lustre/obdclass/genops.c | 3 - .../staging/lustre/lustre/obdclass/kernelcomm.c | 7 +- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +- .../lustre/lustre/obdclass/lprocfs_status.c | 66 +- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 2 +- drivers/staging/lustre/lustre/obdclass/uuid.c | 45 -- 25 files changed, 753 insertions(+), 622 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/uuid.c