public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: Chris Mason <clm@fb•com>, Josef Bacik <jbacik@fb•com>,
	David Sterba <dsterba@suse•cz>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: build failure after merge of the fuse tree
Date: Fri, 22 Jul 2016 11:01:25 +1000	[thread overview]
Message-ID: <20160722110125.601f2043@canb.auug.org.au> (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

next             reply	other threads:[~2016-07-22  1:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-22  1:01 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-12 23:15 linux-next: build failure after merge of the fuse tree Stephen Rothwell
2022-10-13  8:49 ` Miklos Szeredi
2010-05-26  1:44 Stephen Rothwell
2010-05-26  6:46 ` Miklos Szeredi
2010-05-26  7:28   ` Stephen Rothwell

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5842423f8f4 dfblob:6c8b98cfee0 )
 OR (
bs:"btrfs: merge fix for "
bs:"mm: export filemap_check_errors() to" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160722110125.601f2043@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=clm@fb$(echo .)com \
    --cc=dsterba@suse$(echo .)cz \
    --cc=jbacik@fb$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=miklos@szeredi$(echo .)hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox