Whamcloud - gitweb
LU-14073 ldiskfs: don't test LDISKFS_IOC_FSSETXATTR 53/49353/4
authorMr NeilBrown <neilb@suse.de>
Fri, 9 Dec 2022 05:31:13 +0000 (16:31 +1100)
committerOleg Drokin <green@whamcloud.com>
Tue, 20 Dec 2022 14:44:16 +0000 (14:44 +0000)
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 <neilb@suse.de>
Change-Id: I88c51c03959ebe98cd5066596f5158fac570a625
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49353
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/osd-ldiskfs/osd_internal.h

index 44c52ec..343cef6 100644 (file)
@@ -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