[lustre-devel] [PATCH 06/33] lustre: uapi: cleanup FSFILT defines

From: Andreas Dilger <[email protected]>

The various FSFILT_IOC_* defines are standard in Linux so remove
them from lustre_user.h. We do keep LL_IOC_GETVERSION to prevent
old tools breakage.

WC-bug-id: https://jira.whamcloud.com/browse/LU-137
Lustre-commit: ac0380dc519aa1531 ("LU-137 osd-ldiskfs: pass through resize ioctl")
Signed-off-by: Andreas Dilger <[email protected]>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/20161
Reviewed-by: Alex Deiter <[email protected]>
Reviewed-by: Li Dongyang <[email protected]>
Reviewed-by: Oleg Drokin <[email protected]>
Signed-off-by: James Simmons <[email protected]>
---
 fs/lustre/llite/llite_lib.c             |  2 +-
 include/uapi/linux/lustre/lustre_user.h | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/fs/lustre/llite/llite_lib.c b/fs/lustre/llite/llite_lib.c
index 37327be5be66..a9acce572e32 100644
--- a/fs/lustre/llite/llite_lib.c
+++ b/fs/lustre/llite/llite_lib.c
@@ -2877,7 +2877,7 @@ int ll_iocontrol(struct inode *inode, struct file *file,
 	case BLKSSZGET:
 		rc = put_user(PAGE_SIZE, (int __user *)uarg);
 		break;
-	case FSFILT_IOC_GETVERSION:
+	case LL_IOC_GETVERSION:
 	case FS_IOC_GETVERSION:
 		rc = put_user(inode->i_generation, (int __user *)uarg);
 		break;
diff --git a/include/uapi/linux/lustre/lustre_user.h b/include/uapi/linux/lustre/lustre_user.h
index 9c0632856bc8..0383db67361d 100644
--- a/include/uapi/linux/lustre/lustre_user.h
+++ b/include/uapi/linux/lustre/lustre_user.h
@@ -91,14 +91,8 @@ typedef struct stat	lstat_t;
 /* for statfs() */
 #define LL_SUPER_MAGIC 0x0BD00BD0
 
-#ifndef FSFILT_IOC_GETFLAGS
-#define FSFILT_IOC_GETFLAGS		_IOR('f', 1, long)
-#define FSFILT_IOC_SETFLAGS		_IOW('f', 2, long)
-#define FSFILT_IOC_GETVERSION		_IOR('f', 3, long)
-#define FSFILT_IOC_SETVERSION		_IOW('f', 4, long)
-#define FSFILT_IOC_GETVERSION_OLD	_IOR('v', 1, long)
-#define FSFILT_IOC_SETVERSION_OLD	_IOW('v', 2, long)
-#endif
+#define LL_IOC_GETVERSION		_IOR('f', 3, long)
+#define FSFILT_IOC_GETVERSION		LL_IOC_GETVERSION /* backward compat */
 
 /* FIEMAP flags supported by Lustre */
 #define LUSTRE_FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_DEVICE_ORDER)
-- 
2.39.3

_______________________________________________
lustre-devel mailing list
[email protected]
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org