vfs: Rename end_writeback() to clear_inode()

[mirror_ubuntu-zesty-kernel.git] / fs / gfs2 / super.c

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 4553ce515f62f3a8c3f59b2c65a0921f10806e08..713e621c240b9e6989ea50b7fa0a0c4f3b5f111d 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1417,7 +1417,7 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip)
        if (error)
                goto out;
 
-       rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);
+       rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr, 1);
        if (!rgd) {
                gfs2_consist_inode(ip);
                error = -EIO;
@@ -1554,9 +1554,10 @@ out_unlock:
 out:
        /* Case 3 starts here */
        truncate_inode_pages(&inode->i_data, 0);
-       end_writeback(inode);
+       clear_inode(inode);
        gfs2_dir_hash_inval(ip);
        ip->i_gl->gl_object = NULL;
+       flush_delayed_work_sync(&ip->i_gl->gl_work);
        gfs2_glock_add_to_lru(ip->i_gl);
        gfs2_glock_put(ip->i_gl);
        ip->i_gl = NULL;