Merge branch 'fix/hda' into for-linus

[~andy/linux] / fs / logfs / inode.c

diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 6d08b37626410cc807fd5726f98971f238a89b4b..14ed27274da26954bcc451bfb022aa92e0761aa7 100644 (file)
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -6,6 +6,7 @@
  * Copyright (c) 2005-2008 Joern Engel <joern@logfs.org>
  */
 #include "logfs.h"
+#include <linux/slab.h>
 #include <linux/writeback.h>
 #include <linux/backing-dev.h>
 
@@ -282,7 +283,7 @@ struct inode *logfs_read_meta_inode(struct super_block *sb, u64 ino)
        return inode;
 }
 
-static int logfs_write_inode(struct inode *inode, int do_sync)
+static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
        int ret;
        long flags = WF_LOCK;