reverted:
--- b/fs/bcachefs/fs/xattr.rs
+++ a/fs/bcachefs/fs/xattr.rs
@@ -462,12 +462,6 @@
     use crate::vfs::dentry::Dentry;
     use crate::vfs::inode::{InodeInfo, ATTR_CTIME};
 
-    /// An xattr_handler's ->set() idmap: const from 7.4.
-    #[cfg(linux_ge = "7.4")]
-    type SetIdmap = *const c::mnt_idmap;
-    #[cfg(not(linux_ge = "7.4"))]
-    type SetIdmap = *mut c::mnt_idmap;
-
     /// What listxattr writes into: as C's struct xattr_buf. Without a buffer,
     /// only how much would be written is counted.
     struct XattrBuf<'b> {
@@ -589,7 +583,7 @@
     #[allow(clippy::too_many_arguments)]
     pub unsafe extern "C" fn bch2_xattr_set_handler(
         handler: *const c::xattr_handler,
+        _idmap:  *mut c::mnt_idmap,
-        _idmap:  SetIdmap,
         _dentry: *mut c::dentry,
         vinode:  *mut c::inode,
         name:    *const c_char,
@@ -795,7 +789,7 @@
     #[allow(clippy::too_many_arguments)]
     pub unsafe extern "C" fn bch2_xattr_bcachefs_set(
         _handler: *const c::xattr_handler,
+        _idmap:   *mut c::mnt_idmap,
-        _idmap:   SetIdmap,
         dentry:   *mut c::dentry,
         vinode:   *mut c::inode,
         name:     *const c_char,
@@ -815,7 +809,7 @@
     #[allow(clippy::too_many_arguments)]
     pub extern "C" fn bch2_xattr_bcachefs_set_effective(
         _handler: *const c::xattr_handler,
+        _idmap:   *mut c::mnt_idmap,
-        _idmap:   SetIdmap,
         _dentry:  *mut c::dentry,
         _vinode:  *mut c::inode,
         _name:    *const c_char,
