Linux 6.6 compat: generic_fillattr has a new u32 request_mask added at arg2

[mirror_zfs.git] / module / os / linux / zfs / zpl_ctldir.c

diff --git a/module/os/linux/zfs/zpl_ctldir.c b/module/os/linux/zfs/zpl_ctldir.c
index 7786444fea3536d2c661414a5e81c15f175c6f94..8ee7fcecc7b7a939c86d96d2b9eb3627ea3dbafa 100644 (file)
--- a/module/os/linux/zfs/zpl_ctldir.c
+++ b/module/os/linux/zfs/zpl_ctldir.c
@@ -124,6 +124,8 @@ zpl_root_getattr_impl(const struct path *path, struct kstat *stat,
        generic_fillattr(user_ns, ip, stat);
 #elif defined(HAVE_GENERIC_FILLATTR_IDMAP)
        generic_fillattr(user_ns, ip, stat);
+#elif defined(HAVE_GENERIC_FILLATTR_IDMAP_REQMASK)
+       generic_fillattr(user_ns, request_mask, ip, stat);
 #else
        (void) user_ns;
 #endif
@@ -435,6 +437,8 @@ zpl_snapdir_getattr_impl(const struct path *path, struct kstat *stat,
        generic_fillattr(user_ns, ip, stat);
 #elif defined(HAVE_GENERIC_FILLATTR_IDMAP)
        generic_fillattr(user_ns, ip, stat);
+#elif defined(HAVE_GENERIC_FILLATTR_IDMAP_REQMASK)
+       generic_fillattr(user_ns, request_mask, ip, stat);
 #else
        (void) user_ns;
 #endif
@@ -609,6 +613,8 @@ zpl_shares_getattr_impl(const struct path *path, struct kstat *stat,
                generic_fillattr(user_ns, path->dentry->d_inode, stat);
 #elif defined(HAVE_GENERIC_FILLATTR_IDMAP)
                generic_fillattr(user_ns, path->dentry->d_inode, stat);
+#elif defined(HAVE_GENERIC_FILLATTR_IDMAP_REQMASK)
+       generic_fillattr(user_ns, request_mask, ip, stat);
 #else
                (void) user_ns;
 #endif
@@ -623,7 +629,10 @@ zpl_shares_getattr_impl(const struct path *path, struct kstat *stat,
 
        error = -zfs_zget(zfsvfs, zfsvfs->z_shares_dir, &dzp);
        if (error == 0) {
-#if (defined(HAVE_USERNS_IOPS_GETATTR) || defined(HAVE_IDMAP_IOPS_GETATTR))
+#ifdef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK
+               error = -zfs_getattr_fast(user_ns, request_mask, ZTOI(dzp),
+                   stat);
+#elif (defined(HAVE_USERNS_IOPS_GETATTR) || defined(HAVE_IDMAP_IOPS_GETATTR))
                error = -zfs_getattr_fast(user_ns, ZTOI(dzp), stat);
 #else
                error = -zfs_getattr_fast(kcred->user_ns, ZTOI(dzp), stat);