diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-16 13:55:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-16 13:55:02 +1000 |
| commit | 716529caab9957789c8035b8e50f38563e28b6bd (patch) | |
| tree | fa2c5bf68f4859d5ce8c84b041e6b2ad6a9cacda /fs/jfs/jfs_metapage.c | |
| parent | c8f5f1dd7baf729c9ff305a43477068f9a80aafb (diff) | |
| parent | 8c9a4aa19547bdaca322bf5560adb35c8d0ebaef (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/jfs/jfs_metapage.c')
| -rw-r--r-- | fs/jfs/jfs_metapage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 6740d34cd82b..6ba675782e9f 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c @@ -283,7 +283,8 @@ static void last_read_complete(struct page *page) unlock_page(page); } -static void metapage_read_end_io(struct bio *bio, int err) +static void metapage_read_end_io(struct bio *bio, int err, + struct batch_complete *batch) { struct page *page = bio->bi_private; @@ -338,7 +339,8 @@ static void last_write_complete(struct page *page) end_page_writeback(page); } -static void metapage_write_end_io(struct bio *bio, int err) +static void metapage_write_end_io(struct bio *bio, int err, + struct batch_complete *batch) { struct page *page = bio->bi_private; |