btrfs: ignore unfragmented file checks in defrag when compression enabled - rebased

[karo-tx-linux.git] / fs / nilfs2 / inode.c

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 8f7b95ac1f7e438ffe8de2bab81b3b8c40d1eeb9..7cc64465ec2699960f045f37cd29bab8931c76ff 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -734,7 +734,7 @@ void nilfs_evict_inode(struct inode *inode)
        if (inode->i_nlink || !ii->i_root || unlikely(is_bad_inode(inode))) {
                if (inode->i_data.nrpages)
                        truncate_inode_pages(&inode->i_data, 0);
-               end_writeback(inode);
+               clear_inode(inode);
                nilfs_clear_inode(inode);
                return;
        }
@@ -746,7 +746,7 @@ void nilfs_evict_inode(struct inode *inode)
        /* TODO: some of the following operations may fail.  */
        nilfs_truncate_bmap(ii, 0);
        nilfs_mark_inode_dirty(inode);
-       end_writeback(inode);
+       clear_inode(inode);
 
        ret = nilfs_ifile_delete_inode(ii->i_root->ifile, inode->i_ino);
        if (!ret)