From aa57e829867caa9122bb452c83e08af3d687f87e Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 6 Jul 2020 08:34:42 -0400 Subject: [PATCH 1/1] LU-12678 lnet: discard LNET_MD_PHYS This macro has no value and is never set. It claims "compatibility with Cray Portals", yet cray-dvs git://github.com/glennklockwood/cray-dvs.git does not use it in any non-trivial way. Much has changed in lnet and lib-md since 2007 when this value was added - it seems likely that this really is dead. So remove it. If/when this results in problems, it can easily be re-added and more details can be provided at that time. Test-Parameters: trivial testlist=sanity-lnet Signed-off-by: Mr NeilBrown Change-Id: Idef9389f4c0993adbdf088d0ccd9a0dc1449e86e Reviewed-on: https://review.whamcloud.com/39301 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Alexey Lyashkov Reviewed-by: Chris Horn Reviewed-by: Shaun Tancheff Reviewed-by: Oleg Drokin --- lnet/include/uapi/linux/lnet/lnet-types.h | 3 --- lustre/ptlrpc/pers.c | 1 - 2 files changed, 4 deletions(-) diff --git a/lnet/include/uapi/linux/lnet/lnet-types.h b/lnet/include/uapi/linux/lnet/lnet-types.h index f8be3e2..3b1698f 100644 --- a/lnet/include/uapi/linux/lnet/lnet-types.h +++ b/lnet/include/uapi/linux/lnet/lnet-types.h @@ -355,9 +355,6 @@ struct lnet_md { /** See struct lnet_md::options. */ #define LNET_MD_NO_TRACK_RESPONSE (1 << 11) -/* For compatibility with Cray Portals */ -#define LNET_MD_PHYS 0 - /** Infinite threshold on MD operations. See struct lnet_md::threshold */ #define LNET_MD_THRESH_INF (-1) diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c index 14e11a6..1009fd5 100644 --- a/lustre/ptlrpc/pers.c +++ b/lustre/ptlrpc/pers.c @@ -50,7 +50,6 @@ void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc, LASSERT(mdidx < desc->bd_md_max_brw); LASSERT(desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES); - LASSERT(!(md->options & (LNET_MD_KIOV | LNET_MD_PHYS))); /* just send a lnet header */ if (mdidx >= desc->bd_md_count) { -- 1.8.3.1