From: Jan Kara Date: Mon, 7 Nov 2011 23:20:39 +0000 (+0100) Subject: ocfs2: Use filemap_write_and_wait() instead of write_inode_now() X-Git-Tag: MMI-PSA29.97-13-9~17941^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=249ec93c01db8898058899a80ffb537c8d27f86f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Joel Becker --- 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); }