Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1448289

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

Show all headers | View raw

Hi Miklos,

After merging the fuse tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/btrfs/file.c: In function 'btrfs_sync_file':
fs/btrfs/file.c:2043:9: error: implicit declaration of function 'btrfs_inode_check_errors' [-Werror=implicit-function-declaration]
   ret = btrfs_inode_check_errors(inode);
         ^

Caused by commit

  7b9885f4acb2 ("mm: export filemap_check_errors() to modules")

interacting with commit

  52c7064bb62a ("Btrfs: add missing check for writeback errors on fsync")

from the btrfs-kdave tree.

I applied the following merge fix patch and can carry it as necessary.
Someone needs to let Linus know about this when he meregs these trees.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Jul 2016 10:57:27 +1000
Subject: [PATCH] btrfs: merge fix for "mm: export filemap_check_errors() to
 modules"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/btrfs/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 5842423f8f47..6c8b98cfee09 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2040,7 +2040,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 		 * flags for any errors that might have happened while doing
 		 * writeback of file data.
 		 */
-		ret = btrfs_inode_check_errors(inode);
+		ret = filemap_check_errors(inode->i_mapping);
 		inode_unlock(inode);
 		goto out;
 	}
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the fuse tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-22 03:10 +0200

csiph-web