Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / fs / ext4 / fsync.c

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 5c43725..88effb1 100644 (file)
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -61,6 +61,13 @@ static int ext4_sync_parent(struct inode *inode)
                        break;
                iput(inode);
                inode = next;
+               /*
+                * The directory inode may have gone through rmdir by now. But
+                * the inode itself and its blocks are still allocated (we hold
+                * a reference to the inode so it didn't go through
+                * ext4_evict_inode()) and so we are safe to flush metadata
+                * blocks and the inode.
+                */
                ret = sync_mapping_buffers(inode->i_mapping);
                if (ret)
                        break;
@@ -107,7 +114,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 
        if (!journal) {
                ret = __generic_file_fsync(file, start, end, datasync);
-               if (!ret && !hlist_empty(&inode->i_dentry))
+               if (!ret)
                        ret = ext4_sync_parent(inode);
                if (test_opt(inode->i_sb, BARRIER))
                        goto issue_flush;