Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp422203imm; Tue, 5 Jun 2018 23:12:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLDc3xoIfA7C+QNMWbiOWQR/+WpP5OPS95yBDin7nzgloPII3X3Kgkuryi9spfWrtf670tj X-Received: by 2002:a17:902:a714:: with SMTP id w20-v6mr1844922plq.374.1528265563542; Tue, 05 Jun 2018 23:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528265563; cv=none; d=google.com; s=arc-20160816; b=Ec6f4LBVkXDJIrBkAOKM6uRFPl8/B0tANJwgWCzNJjZcZR5CrWEoGyxJj23TBPPzhu AGgmDIxse6MFiFL/VPVvbzClCKN4sOyjSZE2GHVSlhybXAU9cn40QmoN3HihwpcXBzKI K17RMuZOOu7P/84Z0zq9rhDcBNU08JV5OcFUuqNASW08aFGO1yJyxYS4ULBqoAZjzHij O35NAz4575SpX/msQFv3vSZa1EZxW7+o3F2IXV53OGBzI+HY4HEmWgAAP+z41KdN2G+/ X8S9ccPI5fI/TlMSuTw3nsdUSmSu7erQr0+MkgtZTs/aRKRdN5M5pnLq3BogqcQ4gekK IK4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:message-id:cc:subject:date:to:from :arc-authentication-results; bh=VLBmTVTbzC58K21L+30apofrYEVRzYwuHM4RPMpXUX0=; b=M588Ra+j//pS1xbHCYLIYsQhrSK/LR34pbH5iqwITVnlLPY+DcNJcZrPEi5AmFkQAP PnjtRRIcmxS1voPVuYmWy4Dlh0itXJNsIY+jQaJ2h6owUcTayPpjgp/q5TpLH62kL46X wxuFF9AMfNZ533dE0SF32p7PNMRxpxHbiHFDUJsoCJdE5UcvAifUh78KDaXLOpM/ybry f4SLdTlfmxEJrIiMFkBb6KDlD52Yi/Up3S516kj0pfl7QAVc8UE4OzvXOdAIiW/KlLsf //SCiwxGfumg1ivrdks0wyyxd1h0TjeMuRHhSc9pPPBsQu2o8afiiqzSb45ZVr0qXesH KyHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16-v6si12065338pli.269.2018.06.05.23.12.29; Tue, 05 Jun 2018 23:12:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752285AbeFFGLH (ORCPT + 99 others); Wed, 6 Jun 2018 02:11:07 -0400 Received: from mx2.suse.de ([195.135.220.15]:52225 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbeFFGLG (ORCPT ); Wed, 6 Jun 2018 02:11:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BD228AF59; Wed, 6 Jun 2018 06:11:04 +0000 (UTC) From: NeilBrown To: Oleg Drokin , Greg Kroah-Hartman , James Simmons , Andreas Dilger Date: Wed, 06 Jun 2018 16:05:18 +1000 Subject: [md PATCH 00/11] staging: More lustre cleanup - particularly interval-trees Cc: Linux Kernel Mailing List , Lustre Development List Message-ID: <152826510267.16761.14361003167157833896.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, here is my next batch of cleanups for lustre. Note that this series conflicts with a patch that Greg posted recently but that has not yet landed in staging-next (it is in staging-testing). Up to Greg which gets into staging-next first of course. I started with the last 5 patches but noticed interval-tree and decided I should deal with that first. So I added the interval-tree clean-up. That set is more work to review, so I put it first. Comments welcome, Thanks, NeilBrown --- NeilBrown (11): staging: lustre: simplify use of interval-tree. staging: lustre: change lock_matches() to return bool. staging: lustre: move interval_insert call from ldlm_lock to ldlm_extent staging: lustre: convert range_lock to linux interval_trees. staging: lustre: convert ldlm extent locks to linux extent-tree staging: lustre: remove interval_tree staging: lustre: fold lprocfs_call_handler functionality into lnet_debugfs_* staging: lustre: obdclass: move linux/linux-foo.c to foo.c staging: lustre: discard WIRE_ATTR staging: lustre: move ldlm into ptlrpc staging: lustre: centralize setting of subdir-ccflags-y drivers/staging/lustre/Makefile | 3 .../staging/lustre/include/linux/libcfs/libcfs.h | 4 .../staging/lustre/include/linux/lnet/socklnd.h | 8 .../lustre/include/uapi/linux/lnet/lnet-types.h | 28 .../lustre/include/uapi/linux/lnet/lnetst.h | 4 drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 2 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 22 drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 2 drivers/staging/lustre/lnet/libcfs/Makefile | 2 drivers/staging/lustre/lnet/libcfs/module.c | 84 - drivers/staging/lustre/lnet/lnet/Makefile | 2 drivers/staging/lustre/lnet/lnet/router_proc.c | 41 drivers/staging/lustre/lnet/selftest/Makefile | 2 drivers/staging/lustre/lnet/selftest/rpc.h | 48 drivers/staging/lustre/lustre/fid/Makefile | 2 drivers/staging/lustre/lustre/fld/Makefile | 2 .../staging/lustre/lustre/include/interval_tree.h | 119 - drivers/staging/lustre/lustre/include/lustre_dlm.h | 19 drivers/staging/lustre/lustre/ldlm/interval_tree.c | 599 ------ drivers/staging/lustre/lustre/ldlm/l_lock.c | 73 - drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 258 -- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 486 ----- .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 69 - drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 342 --- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 842 -------- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2135 -------------------- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 1163 ----------- drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 68 - drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 1013 --------- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2033 ------------------- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1318 ------------ drivers/staging/lustre/lustre/llite/Makefile | 2 drivers/staging/lustre/lustre/llite/file.c | 8 drivers/staging/lustre/lustre/llite/range_lock.c | 141 - drivers/staging/lustre/lustre/llite/range_lock.h | 25 drivers/staging/lustre/lustre/lmv/Makefile | 2 drivers/staging/lustre/lustre/lov/Makefile | 2 drivers/staging/lustre/lustre/mdc/Makefile | 2 drivers/staging/lustre/lustre/mgc/Makefile | 2 drivers/staging/lustre/lustre/obdclass/Makefile | 4 .../lustre/lustre/obdclass/linux/linux-module.c | 514 ----- .../lustre/lustre/obdclass/linux/linux-sysctl.c | 162 -- drivers/staging/lustre/lustre/obdclass/module.c | 514 +++++ drivers/staging/lustre/lustre/obdclass/sysctl.c | 162 ++ drivers/staging/lustre/lustre/obdecho/Makefile | 2 drivers/staging/lustre/lustre/osc/Makefile | 2 drivers/staging/lustre/lustre/ptlrpc/Makefile | 17 drivers/staging/lustre/lustre/ptlrpc/l_lock.c | 73 + drivers/staging/lustre/lustre/ptlrpc/ldlm_extent.c | 206 ++ drivers/staging/lustre/lustre/ptlrpc/ldlm_flock.c | 486 +++++ .../staging/lustre/lustre/ptlrpc/ldlm_inodebits.c | 69 + .../staging/lustre/lustre/ptlrpc/ldlm_internal.h | 329 +++ drivers/staging/lustre/lustre/ptlrpc/ldlm_lib.c | 842 ++++++++ drivers/staging/lustre/lustre/ptlrpc/ldlm_lock.c | 2103 ++++++++++++++++++++ drivers/staging/lustre/lustre/ptlrpc/ldlm_lockd.c | 1154 +++++++++++ drivers/staging/lustre/lustre/ptlrpc/ldlm_plain.c | 68 + drivers/staging/lustre/lustre/ptlrpc/ldlm_pool.c | 1013 +++++++++ .../staging/lustre/lustre/ptlrpc/ldlm_request.c | 2033 +++++++++++++++++++ .../staging/lustre/lustre/ptlrpc/ldlm_resource.c | 1318 ++++++++++++ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 60 files changed, 10527 insertions(+), 11523 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/interval_tree.h delete mode 100644 drivers/staging/lustre/lustre/ldlm/interval_tree.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/l_lock.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_request.c delete mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c create mode 100644 drivers/staging/lustre/lustre/obdclass/module.c create mode 100644 drivers/staging/lustre/lustre/obdclass/sysctl.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/l_lock.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_extent.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_flock.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_inodebits.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_internal.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_lib.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_lock.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_lockd.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_plain.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_pool.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_request.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ldlm_resource.c -- Signature