summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2011-11-08 00:20:39 +0100
committerJoel Becker <jlbec@evilplan.org>2011-11-17 02:18:57 -0800
commit249ec93c01db8898058899a80ffb537c8d27f86f (patch)
tree381c22ba9726ac884aa1267b91736fff3836c766
parentdf295d4a4b3c98af1a2445a82aef169e7e5d96b8 (diff)
downloadblackbird-op-linux-249ec93c01db8898058899a80ffb537c8d27f86f.tar.gz
blackbird-op-linux-249ec93c01db8898058899a80ffb537c8d27f86f.zip
ocfs2: Use filemap_write_and_wait() instead of write_inode_now()
Since ocfs2 has no ->write_inode method, there's no point in calling write_inode_now() from ocfs2_cleanup_delete_inode(). Use filemap_write_and_wait() instead. This helps us to cleanup inode writing interfaces... Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Joel Becker <jlbec@evilplan.org>
-rw-r--r--fs/ocfs2/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index b4c8bb6b8d28..c4bf6ac4a0bb 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -951,7 +951,7 @@ static void ocfs2_cleanup_delete_inode(struct inode *inode,
trace_ocfs2_cleanup_delete_inode(
(unsigned long long)OCFS2_I(inode)->ip_blkno, sync_data);
if (sync_data)
- write_inode_now(inode, 1);
+ filemap_write_and_wait(inode->i_mapping);
truncate_inode_pages(&inode->i_data, 0);
}
OpenPOWER on IntegriCloud