linux-next: build failure after merge of the fs-next tree

[Mark Brown]

Hi all,

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

/tmp/next/build/fs/ntfs/file.c: In function 'ntfs_file_mmap_prepare':
/tmp/next/build/fs/ntfs/file.c:657:13: error: implicit declaration of function 'vma_desc_test_flags'; did you mean 'vma_desc_set_flags'? [-Wimplicit-function-declaration]
  657 |         if (vma_desc_test_flags(desc, VMA_WRITE_BIT)) {
      |             ^~~~~~~~~~~~~~~~~~~
      |             vma_desc_set_flags

Caused by an interaction with commit:

  2c3b5ea7028fa (mm: reintroduce vma_desc_test() as a singular flag test)

from one of the mm trees, I've fixed it up as below and can carry as
needed.

commit 8cbd256f4ac9d0b08b6fc30b305cfcb51b9de9f7
Author: Mark Brown <broonie@xxxxxxxxxx>
Date:   Mon Mar 9 13:24:55 2026 +0000

    ntfs: Fix up mm merge
    
    /tmp/next/build/fs/ntfs/file.c: In function 'ntfs_file_mmap_prepare':
    /tmp/next/build/fs/ntfs/file.c:657:13: error: implicit declaration of function 'vma_desc_test_flags'; did you mean 'vma_desc_set_flags'? [-Wimplicit-function-declaration]
      657 |         if (vma_desc_test_flags(desc, VMA_WRITE_BIT)) {
          |             ^~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 2735780159999..e5b897a6c1e15 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -654,7 +654,7 @@ static int ntfs_file_mmap_prepare(struct vm_area_desc *desc)
 	if (NInoCompressed(NTFS_I(inode)))
 		return -EOPNOTSUPP;
 
-	if (vma_desc_test_flags(desc, VMA_WRITE_BIT)) {
+	if (vma_desc_test(desc, VMA_WRITE_BIT)) {
 		struct inode *inode = file_inode(file);
 		loff_t from, to;
 		int err;

Attachment: signature.asc
Description: PGP signature