From 40389067f5645fed903304d19dd6c58de72d0b88 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Fri, 9 Dec 2022 16:31:13 +1100 Subject: [PATCH] LU-14073 ldiskfs: don't test LDISKFS_IOC_FSSETXATTR EXT4_IOC_FSSETXATTR was removed upstream in Linux 5.9, Commit cb29a02d3a9d ("ext4: use generic names for generic ioctls"). So we cannot use it to test if project quotas are supported. Instead test if EXT4_MAXQUOTAS is 3. This was changed to 3 upstream in the commit immediately before EXT4_IOC_FSSETXATTR was added, so it is effectively the same test. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I88c51c03959ebe98cd5066596f5158fac570a625 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49353 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/osd-ldiskfs/osd_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h index 44c52ec..343cef6 100644 --- a/lustre/osd-ldiskfs/osd_internal.h +++ b/lustre/osd-ldiskfs/osd_internal.h @@ -101,7 +101,7 @@ extern struct kmem_cache *dynlock_cachep; #define OSD_DEFAULT_EXTENT_BYTES (1U << 20) /* check if ldiskfs support project quota */ -#ifndef LDISKFS_IOC_FSSETXATTR +#if LDISKFS_MAXQUOTAS < 3 #undef HAVE_PROJECT_QUOTA #endif -- 1.8.3.1