Merge commit 'v2.6.34-rc1' into perf/urgent

[mirror_ubuntu-bionic-kernel.git] / fs / ufs / inode.c

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index fff8edab382f99b4e57b780ee4ca406ae707bcc3..80b68c3702d129bffeaddbdd388b7ad50ca74e4b 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -36,6 +36,7 @@
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
+#include <linux/writeback.h>
 #include <linux/quotaops.h>
 
 #include "ufs_fs.h"
@@ -891,11 +892,11 @@ static int ufs_update_inode(struct inode * inode, int do_sync)
        return 0;
 }
 
-int ufs_write_inode (struct inode * inode, int wait)
+int ufs_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
        int ret;
        lock_kernel();
-       ret = ufs_update_inode (inode, wait);
+       ret = ufs_update_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
        unlock_kernel();
        return ret;
 }
@@ -910,7 +911,7 @@ void ufs_delete_inode (struct inode * inode)
        loff_t old_i_size;
 
        if (!is_bad_inode(inode))
-               vfs_dq_init(inode);
+               dquot_initialize(inode);
 
        truncate_inode_pages(&inode->i_data, 0);
        if (is_bad_inode(inode))