Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / fs / f2fs / dir.c

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index a34ebd8312ab89e703cfe85a3820072b4d06c083..8f15fc134040c5ee4865f975cc37dfeffe58360f 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -718,8 +718,8 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
        if (inode)
                f2fs_drop_nlink(dir, inode, NULL);
 
-       if (bit_pos == NR_DENTRY_IN_BLOCK) {
-               truncate_hole(dir, page->index, page->index + 1);
+       if (bit_pos == NR_DENTRY_IN_BLOCK &&
+                       !truncate_hole(dir, page->index, page->index + 1)) {
                clear_page_dirty_for_io(page);
                ClearPagePrivate(page);
                ClearPageUptodate(page);