From ff168481a1b2e549df22059db364cae7a315ec9b Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 21 Jan 2020 02:32:54 -0700 Subject: [PATCH 1/1] LU-13164 uapi: remove unused LUSTRE_DIRECTIO_FL The LUSTRE_DIRECTIO_FL was added based on the upstream FS_DIRECTIO_FL flag in the hopes that it might be useful, but it has since been removed from the upstream in kernel commit v4.4-rc4-22-g68ce7bfcd995 and replaced by FS_VERITY_FL using the same value in kernel commit v5.3-rc2-4-gfe9918d3b228, which we are much more likely to use. Since LUSTRE_DIRECTIO_FL was unused, there is no risk to remove it. Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: I49e915612636a674a86d25be5d91a042693ebbe5 Reviewed-on: https://review.whamcloud.com/37295 Tested-by: jenkins Reviewed-by: Shaun Tancheff Reviewed-by: Arshad Hussain Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/include/uapi/linux/lustre/lustre_idl.h | 1 - lustre/ptlrpc/wiretest.c | 2 -- lustre/utils/wirecheck.c | 1 - lustre/utils/wiretest.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h index ab3d045..df2ce2b 100644 --- a/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -1752,7 +1752,6 @@ enum { LUSTRE_INDEX_FL = 0x00001000, /* hash-indexed directory */ LUSTRE_DIRSYNC_FL = 0x00010000, /* dirsync behaviour (dir only) */ LUSTRE_TOPDIR_FL = 0x00020000, /* Top of directory hierarchies*/ - LUSTRE_DIRECTIO_FL = 0x00100000, /* Use direct i/o */ LUSTRE_INLINE_DATA_FL = 0x10000000, /* Inode has inline data. */ LUSTRE_PROJINHERIT_FL = 0x20000000, /* Create with parents projid */ diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index fd14718..1968b84 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -2516,8 +2516,6 @@ void lustre_assert_wire_constants(void) (unsigned)LUSTRE_DIRSYNC_FL); LASSERTF(LUSTRE_TOPDIR_FL == 0x00020000UL, "found 0x%.8xUL\n", (unsigned)LUSTRE_TOPDIR_FL); - LASSERTF(LUSTRE_DIRECTIO_FL == 0x00100000UL, "found 0x%.8xUL\n", - (unsigned)LUSTRE_DIRECTIO_FL); LASSERTF(LUSTRE_INLINE_DATA_FL == 0x10000000UL, "found 0x%.8xUL\n", (unsigned)LUSTRE_INLINE_DATA_FL); LASSERTF(MDS_INODELOCK_LOOKUP == 0x00000001UL, "found 0x%.8xUL\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index f6c9bad..ddbb7ce 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -1139,7 +1139,6 @@ check_mdt_body(void) CHECK_VALUE_X(LUSTRE_ORPHAN_FL); CHECK_VALUE_X(LUSTRE_DIRSYNC_FL); CHECK_VALUE_X(LUSTRE_TOPDIR_FL); - CHECK_VALUE_X(LUSTRE_DIRECTIO_FL); CHECK_VALUE_X(LUSTRE_INLINE_DATA_FL); CHECK_VALUE_X(MDS_INODELOCK_LOOKUP); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 391ca56..63c1ea9 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -2546,8 +2546,6 @@ void lustre_assert_wire_constants(void) (unsigned)LUSTRE_DIRSYNC_FL); LASSERTF(LUSTRE_TOPDIR_FL == 0x00020000UL, "found 0x%.8xUL\n", (unsigned)LUSTRE_TOPDIR_FL); - LASSERTF(LUSTRE_DIRECTIO_FL == 0x00100000UL, "found 0x%.8xUL\n", - (unsigned)LUSTRE_DIRECTIO_FL); LASSERTF(LUSTRE_INLINE_DATA_FL == 0x10000000UL, "found 0x%.8xUL\n", (unsigned)LUSTRE_INLINE_DATA_FL); LASSERTF(MDS_INODELOCK_LOOKUP == 0x00000001UL, "found 0x%.8xUL\n", -- 1.8.3.1