Hi Andrew,
After merging the akpm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/jfs/jfs_logmgr.c: In function 'lbmRead':
fs/jfs/jfs_logmgr.c:2015:3: error: too few arguments to function 'lbmIODone'
lbmIODone(bio, 0);
^
fs/jfs/jfs_logmgr.c:194:21: note: declared here
static bio_end_io_t lbmIODone;
^
Caused by commit daf8a85f357a ("block: prep work for batch completion")
from the akpm tree interacting with commit 95bbb82f60c8 ("fs/jfs: Add
check if journaling to disk has been disabled in lbmRead()") from the jfs
tree.
I applied the following fix up patch and can carry it as necessary.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 27 May 2013 16:37:05 +1000
Subject: [PATCH] jfs: fix up for batch completion API change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/jfs/jfs_logmgr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 0787ecc..4c3289c 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -2012,7 +2012,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
/*check if journaling to disk has been disabled*/
if (log->no_integrity) {
bio->bi_size = 0;
- lbmIODone(bio, 0);
+ lbmIODone(bio, 0, NULL);
} else {
submit_bio(READ_SYNC, bio);
}
--
1.8.1
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp1UVjBLrO5u.pgp
Description: PGP signature
