GFS2: Clear gl_object when deleting an inode in gfs2_delete_inode

This patch adds some calls to clear gl_object in function
gfs2_delete_inode. Since we are deleting the inode, and the glock
typically outlives the inode in core, we must clear gl_object
so subsequent use of the glock (e.g. for a new inode in its place)
will not have the old pointer sitting there. In error cases we
need to tidy up after ourselves. In non-error cases, we need to
clear gl_object before we set the block free in the bitmap so
residules aren't left for potential inode creators.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 5fdc54158ff6da99951c12bae8523d6b6eee0fc3..87271a859a8d197f3e6561d17af9479a8df3cff2 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1547,6 +1547,7 @@ static void gfs2_evict_inode(struct inode *inode)
        /* Must not read inode block until block type has been verified */
        error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_SKIP, &gh);
        if (unlikely(error)) {
+               glock_clear_object(ip->i_iopen_gh.gh_gl, ip);
                ip->i_iopen_gh.gh_flags |= GL_NOCACHE;
                gfs2_glock_dq_uninit(&ip->i_iopen_gh);
                goto out;
@@ -1595,6 +1596,11 @@ alloc_failed:
                        goto out_unlock;
        }
 
+       /* We're about to clear the bitmap for the dinode, but as soon as we
+          do, gfs2_create_inode can create another inode at the same block
+          location and try to set gl_object again. We clear gl_object here so
+          that subsequent inode creates don't see an old gl_object. */
+       glock_clear_object(ip->i_gl, ip);
        error = gfs2_dinode_dealloc(ip);
        goto out_unlock;
 
@@ -1623,14 +1629,17 @@ out_unlock:
                gfs2_rs_deltree(&ip->i_res);
 
        if (gfs2_holder_initialized(&ip->i_iopen_gh)) {
+               glock_clear_object(ip->i_iopen_gh.gh_gl, ip);
                if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags)) {
                        ip->i_iopen_gh.gh_flags |= GL_NOCACHE;
                        gfs2_glock_dq(&ip->i_iopen_gh);
                }
                gfs2_holder_uninit(&ip->i_iopen_gh);
        }
-       if (gfs2_holder_initialized(&gh))
+       if (gfs2_holder_initialized(&gh)) {
+               glock_clear_object(ip->i_gl, ip);
                gfs2_glock_dq_uninit(&gh);
+       }
        if (error && error != GLR_TRYFAILED && error != -EROFS)
                fs_warn(sdp, "gfs2_evict_inode: %d\n", error);
 out: