diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 14:11:29 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 14:11:29 -0500 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /fs/ocfs2/inode.c | |
| parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
| parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'fs/ocfs2/inode.c')
| -rw-r--r-- | fs/ocfs2/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index a22d2c098890..17454a904d7b 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
| @@ -951,7 +951,7 @@ static void ocfs2_cleanup_delete_inode(struct inode *inode, | |||
| 951 | trace_ocfs2_cleanup_delete_inode( | 951 | trace_ocfs2_cleanup_delete_inode( |
| 952 | (unsigned long long)OCFS2_I(inode)->ip_blkno, sync_data); | 952 | (unsigned long long)OCFS2_I(inode)->ip_blkno, sync_data); |
| 953 | if (sync_data) | 953 | if (sync_data) |
| 954 | write_inode_now(inode, 1); | 954 | filemap_write_and_wait(inode->i_mapping); |
| 955 | truncate_inode_pages(&inode->i_data, 0); | 955 | truncate_inode_pages(&inode->i_data, 0); |
| 956 | } | 956 | } |
| 957 | 957 | ||