linux-next: build failure after merge of the vfs-brauner tree

[Mark Brown]

Hi all,

After merging the vfs-brauner tree, today's linux-next build
(arm multi_v7_defconfig) failed like this:

/tmp/next/build/fs/ntfs/named_stream.c:1811:27: error: initialization of 'int (*)(const struct mnt_idmap *, struct inode *, int)' from incompatible pointer type 'int (*)(struct mnt_idmap *, struct inode *, int)' [-Wincompatible-pointer-types]
 1811 |         .permission     = ntfs_stream_permission,
      |                           ^~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/fs/ntfs/named_stream.c:1811:27: note: (near initialization for 'ntfs_stream_inode_ops.permission')
/tmp/next/build/fs/ntfs/named_stream.c:1812:27: error: initialization of 'int (*)(const struct mnt_idmap *, struct dentry *, struct iattr *)' from incompatible pointer type 'int (*)(struct mnt_idmap *, struct dentry *, struct iattr *)' [-Wincompatible-pointer-types]
 1812 |         .setattr        = ntfs_stream_setattr,
      |                           ^~~~~~~~~~~~~~~~~~~
/tmp/next/build/fs/ntfs/named_stream.c:1812:27: note: (near initialization for 'ntfs_stream_inode_ops.setattr')
/tmp/next/build/fs/ntfs/named_stream.c:1813:27: error: initialization of 'int (*)(const struct mnt_idmap *, const struct path *, struct kstat *, u32,  unsigned int)' {aka 'int (*)(const struct mnt_idmap *, const struct path *, struct kstat *, unsigned int,  unsigned int)'} from incompatible pointer type 'int (*)(struct mnt_idmap *, const struct path *, struct kstat *, unsigned int,  unsigned int)' [-Wincompatible-pointer-types]
 1813 |         .getattr        = ntfs_stream_getattr,
      |                           ^~~~~~~~~~~~~~~~~~~
/tmp/next/build/fs/ntfs/named_stream.c:1813:27: note: (near initialization for 'ntfs_stream_inode_ops.getattr')

Caused by commits

   e2f0d6d4569d1 (fs: port ->setattr() to pass const mnt_idmap)
   c3150ded7bc0e (fs: port ->getattr() to pass const mnt_idmap)

interacting with

   2de2cdd9cc08f (ntfs: add pathname access for named streams)

from the vfs-brauner tree.  I have applied the fixup below and can carry
as needed.

Attachment: signature.asc
Description: PGP signature