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

Mark Brown posted 1 patch 2 weeks, 5 days ago
fs/ntfs3/inode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
linux-next: build failure after merge of the vfs-brauner tree
Posted by Mark Brown 2 weeks, 5 days ago
Hi all,

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

/tmp/next/build/fs/ntfs3/inode.c: In function 'ntfs_read_folio':
/tmp/next/build/fs/ntfs3/inode.c:678:9: error: too few arguments to function 'iomap_read_folio'
  678 |         iomap_read_folio(&ntfs_iomap_ops, &ctx);
      |         ^~~~~~~~~~~~~~~~
In file included from /tmp/next/build/fs/ntfs3/inode.c:15:
/tmp/next/build/include/linux/iomap.h:347:6: note: declared here
  347 | void iomap_read_folio(const struct iomap_ops *ops,
      |      ^~~~~~~~~~~~~~~~
/tmp/next/build/fs/ntfs3/inode.c: In function 'ntfs_readahead':
/tmp/next/build/fs/ntfs3/inode.c:702:9: error: too few arguments to function 'iomap_readahead'
  702 |         iomap_readahead(&ntfs_iomap_ops, &ctx);
      |         ^~~~~~~~~~~~~~~
/tmp/next/build/include/linux/iomap.h:349:6: note: declared here
  349 | void iomap_readahead(const struct iomap_ops *ops,
      |      ^~~~~~~~~~~~~~~

Caused by commit

   8806f279244bf (iomap: stash iomap read ctx in the private field of iomap_iter)

interacting with

   099ef9ab9203d (fs/ntfs3: implement iomap-based file operations)

from the ntfs3 tree.  I have applied the below fixup and will carry:

From f7872b478d46a5bfecf385fe87fd3a5894ac8254 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Mon, 19 Jan 2026 14:10:04 +0000
Subject: [PATCH] ntfs3: Fix merge issue with ntfs3

/tmp/next/build/fs/ntfs3/inode.c: In function 'ntfs_read_folio':
/tmp/next/build/fs/ntfs3/inode.c:678:9: error: too few arguments to function 'iomap_read_folio'
  678 |         iomap_read_folio(&ntfs_iomap_ops, &ctx);
      |         ^~~~~~~~~~~~~~~~
In file included from /tmp/next/build/fs/ntfs3/inode.c:15:
/tmp/next/build/include/linux/iomap.h:347:6: note: declared here
  347 | void iomap_read_folio(const struct iomap_ops *ops,
      |      ^~~~~~~~~~~~~~~~
/tmp/next/build/fs/ntfs3/inode.c: In function 'ntfs_readahead':
/tmp/next/build/fs/ntfs3/inode.c:702:9: error: too few arguments to function 'iomap_readahead'
  702 |         iomap_readahead(&ntfs_iomap_ops, &ctx);
      |         ^~~~~~~~~~~~~~~
/tmp/next/build/include/linux/iomap.h:349:6: note: declared here
  349 | void iomap_readahead(const struct iomap_ops *ops,
      |      ^~~~~~~~~~~~~~~

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 fs/ntfs3/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 2147fce8e0b2a..8959e2f367c07 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -675,7 +675,7 @@ static int ntfs_read_folio(struct file *file, struct folio *folio)
 		return err;
 	}
 
-	iomap_read_folio(&ntfs_iomap_ops, &ctx);
+	iomap_read_folio(&ntfs_iomap_ops, &ctx, NULL);
 	return 0;
 }
 
@@ -699,7 +699,7 @@ static void ntfs_readahead(struct readahead_control *rac)
 		return;
 	}
 
-	iomap_readahead(&ntfs_iomap_ops, &ctx);
+	iomap_readahead(&ntfs_iomap_ops, &ctx, NULL);
 }
 
 int ntfs_set_size(struct inode *inode, u64 new_size)
-- 
2.47.3
Re: linux-next: build failure after merge of the vfs-brauner tree
Posted by kernel test robot 2 weeks, 4 days ago
Hi Mark,

kernel test robot noticed the following build errors:

[auto build test ERROR on next-20260116]
[cannot apply to brauner-vfs/vfs.all xiang-erofs/dev-test xiang-erofs/dev xiang-erofs/fixes v6.19-rc6 v6.19-rc5 v6.19-rc4 linus/master v6.19-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Mark-Brown/linux-next-build-failure-after-merge-of-the-vfs-brauner-tree/20260119-223859
base:   next-20260116
patch link:    https://lore.kernel.org/r/aW5AGPFq0HPi440m%40sirena.org.uk
patch subject: linux-next: build failure after merge of the vfs-brauner tree
config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20260120/202601201642.SjxE1oMu-lkp@intel.com/config)
compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260120/202601201642.SjxE1oMu-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601201642.SjxE1oMu-lkp@intel.com/

All errors (new ones prefixed by >>):

>> fs/ntfs3/inode.c:678:42: error: too many arguments to function call, expected 2, have 3
     678 |         iomap_read_folio(&ntfs_iomap_ops, &ctx, NULL);
         |         ~~~~~~~~~~~~~~~~                        ^~~~
   include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
       8 | #define NULL ((void *)0)
         |              ^~~~~~~~~~~
   include/linux/iomap.h:347:6: note: 'iomap_read_folio' declared here
     347 | void iomap_read_folio(const struct iomap_ops *ops,
         |      ^                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     348 |                 struct iomap_read_folio_ctx *ctx);
         |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   fs/ntfs3/inode.c:702:41: error: too many arguments to function call, expected 2, have 3
     702 |         iomap_readahead(&ntfs_iomap_ops, &ctx, NULL);
         |         ~~~~~~~~~~~~~~~                        ^~~~
   include/linux/stddef.h:8:14: note: expanded from macro 'NULL'
       8 | #define NULL ((void *)0)
         |              ^~~~~~~~~~~
   include/linux/iomap.h:349:6: note: 'iomap_readahead' declared here
     349 | void iomap_readahead(const struct iomap_ops *ops,
         |      ^               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     350 |                 struct iomap_read_folio_ctx *ctx);
         |                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   2 errors generated.


vim +678 fs/ntfs3/inode.c

   647	
   648	static int ntfs_read_folio(struct file *file, struct folio *folio)
   649	{
   650		int err;
   651		struct address_space *mapping = folio->mapping;
   652		struct inode *inode = mapping->host;
   653		struct ntfs_inode *ni = ntfs_i(inode);
   654		loff_t vbo = folio_pos(folio);
   655		struct iomap_read_folio_ctx ctx = {
   656			.cur_folio = folio,
   657			.ops = &ntfs_iomap_bio_read_ops,
   658		};
   659	
   660		if (unlikely(is_bad_ni(ni))) {
   661			folio_unlock(folio);
   662			return -EIO;
   663		}
   664	
   665		if (ni->i_valid <= vbo) {
   666			folio_zero_range(folio, 0, folio_size(folio));
   667			folio_mark_uptodate(folio);
   668			folio_unlock(folio);
   669			return 0;
   670		}
   671	
   672		if (is_compressed(ni)) {
   673			/* ni_lock is taken inside ni_read_folio_cmpr after page locks */
   674			err = ni_read_folio_cmpr(ni, folio);
   675			return err;
   676		}
   677	
 > 678		iomap_read_folio(&ntfs_iomap_ops, &ctx, NULL);
   679		return 0;
   680	}
   681	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Re: linux-next: build failure after merge of the vfs-brauner tree
Posted by kernel test robot 2 weeks, 4 days ago
Hi Mark,

kernel test robot noticed the following build errors:

[auto build test ERROR on next-20260116]
[cannot apply to brauner-vfs/vfs.all xiang-erofs/dev-test xiang-erofs/dev xiang-erofs/fixes v6.19-rc6 v6.19-rc5 v6.19-rc4 linus/master v6.19-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Mark-Brown/linux-next-build-failure-after-merge-of-the-vfs-brauner-tree/20260119-223859
base:   next-20260116
patch link:    https://lore.kernel.org/r/aW5AGPFq0HPi440m%40sirena.org.uk
patch subject: linux-next: build failure after merge of the vfs-brauner tree
config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20260120/202601201453.3N9V4NVP-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 15.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260120/202601201453.3N9V4NVP-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601201453.3N9V4NVP-lkp@intel.com/

All errors (new ones prefixed by >>):

   fs/ntfs3/inode.c: In function 'ntfs_read_folio':
>> fs/ntfs3/inode.c:678:9: error: too many arguments to function 'iomap_read_folio'; expected 2, have 3
     678 |         iomap_read_folio(&ntfs_iomap_ops, &ctx, NULL);
         |         ^~~~~~~~~~~~~~~~
   In file included from fs/ntfs3/inode.c:15:
   include/linux/iomap.h:347:6: note: declared here
     347 | void iomap_read_folio(const struct iomap_ops *ops,
         |      ^~~~~~~~~~~~~~~~
   fs/ntfs3/inode.c: In function 'ntfs_readahead':
>> fs/ntfs3/inode.c:702:9: error: too many arguments to function 'iomap_readahead'; expected 2, have 3
     702 |         iomap_readahead(&ntfs_iomap_ops, &ctx, NULL);
         |         ^~~~~~~~~~~~~~~
   include/linux/iomap.h:349:6: note: declared here
     349 | void iomap_readahead(const struct iomap_ops *ops,
         |      ^~~~~~~~~~~~~~~


vim +/iomap_read_folio +678 fs/ntfs3/inode.c

   647	
   648	static int ntfs_read_folio(struct file *file, struct folio *folio)
   649	{
   650		int err;
   651		struct address_space *mapping = folio->mapping;
   652		struct inode *inode = mapping->host;
   653		struct ntfs_inode *ni = ntfs_i(inode);
   654		loff_t vbo = folio_pos(folio);
   655		struct iomap_read_folio_ctx ctx = {
   656			.cur_folio = folio,
   657			.ops = &ntfs_iomap_bio_read_ops,
   658		};
   659	
   660		if (unlikely(is_bad_ni(ni))) {
   661			folio_unlock(folio);
   662			return -EIO;
   663		}
   664	
   665		if (ni->i_valid <= vbo) {
   666			folio_zero_range(folio, 0, folio_size(folio));
   667			folio_mark_uptodate(folio);
   668			folio_unlock(folio);
   669			return 0;
   670		}
   671	
   672		if (is_compressed(ni)) {
   673			/* ni_lock is taken inside ni_read_folio_cmpr after page locks */
   674			err = ni_read_folio_cmpr(ni, folio);
   675			return err;
   676		}
   677	
 > 678		iomap_read_folio(&ntfs_iomap_ops, &ctx, NULL);
   679		return 0;
   680	}
   681	
   682	static void ntfs_readahead(struct readahead_control *rac)
   683	{
   684		struct address_space *mapping = rac->mapping;
   685		struct inode *inode = mapping->host;
   686		struct ntfs_inode *ni = ntfs_i(inode);
   687		struct iomap_read_folio_ctx ctx = {
   688			.ops = &ntfs_iomap_bio_read_ops,
   689			.rac = rac,
   690		};
   691	
   692		if (is_resident(ni)) {
   693			/* No readahead for resident. */
   694			return;
   695		}
   696	
   697		if (is_compressed(ni)) {
   698			/* No readahead for compressed. */
   699			return;
   700		}
   701	
 > 702		iomap_readahead(&ntfs_iomap_ops, &ctx, NULL);
   703	}
   704	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki