diff --git a/[refs] b/[refs] index ee28b95d9574..aec6f72467f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27ee40df2b17c84aa7855907df12befe6869b7a7 +refs/heads/master: bbd08344e3df8c7c1d7aa04bc0c8c9367806e12d diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 077c3c9c432e..6671fcbb5293 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -2424,9 +2424,9 @@ static int ext4_bh_delay_or_unwritten(handle_t *handle, struct buffer_head *bh) * The function finds extents of pages and scan them for all blocks. */ static int __mpage_da_writepage(struct page *page, - struct writeback_control *wbc, void *data) + struct writeback_control *wbc, + struct mpage_da_data *mpd) { - struct mpage_da_data *mpd = data; struct inode *inode = mpd->inode; struct buffer_head *bh, *head; sector_t logical;