gfs2: Rename GLF_VERIFY_EVICT to GLF_VERIFY_DELETE

Rename the GLF_VERIFY_EVICT flag to GLF_VERIFY_DELETE: that flag
indicates that we want to delete an inode / verify that it has been
deleted.

To match, rename gfs2_queue_verify_evict() to
gfs2_queue_verify_delete().

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 269c3bc7fced7133c3e893bc8f2c471946c0ce35..5addf4ebf33bdb19f9d7c65966fbc0853332265d 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1013,11 +1013,11 @@ bool gfs2_queue_try_to_evict(struct gfs2_glock *gl)
                                  &gl->gl_delete, 0);
 }
 
-static bool gfs2_queue_verify_evict(struct gfs2_glock *gl)
+static bool gfs2_queue_verify_delete(struct gfs2_glock *gl)
 {
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
 
-       if (test_and_set_bit(GLF_VERIFY_EVICT, &gl->gl_flags))
+       if (test_and_set_bit(GLF_VERIFY_DELETE, &gl->gl_flags))
                return false;
        return queue_delayed_work(sdp->sd_delete_wq,
                                  &gl->gl_delete, 5 * HZ);
@@ -1052,19 +1052,19 @@ static void delete_work_func(struct work_struct *work)
                if (gfs2_try_evict(gl)) {
                        if (test_bit(SDF_KILL, &sdp->sd_flags))
                                goto out;
-                       if (gfs2_queue_verify_evict(gl))
+                       if (gfs2_queue_verify_delete(gl))
                                return;
                }
                goto out;
        }
 
-       if (test_and_clear_bit(GLF_VERIFY_EVICT, &gl->gl_flags)) {
+       if (test_and_clear_bit(GLF_VERIFY_DELETE, &gl->gl_flags)) {
                inode = gfs2_lookup_by_inum(sdp, no_addr, gl->gl_no_formal_ino,
                                            GFS2_BLKST_UNLINKED);
                if (IS_ERR(inode)) {
                        if (PTR_ERR(inode) == -EAGAIN &&
                            !test_bit(SDF_KILL, &sdp->sd_flags) &&
-                           gfs2_queue_verify_evict(gl))
+                           gfs2_queue_verify_delete(gl))
                                return;
                } else {
                        d_prune_aliases(inode);
@@ -2118,7 +2118,7 @@ static void glock_hash_walk(glock_examiner examiner, const struct gfs2_sbd *sdp)
 void gfs2_cancel_delete_work(struct gfs2_glock *gl)
 {
        clear_bit(GLF_TRY_TO_EVICT, &gl->gl_flags);
-       clear_bit(GLF_VERIFY_EVICT, &gl->gl_flags);
+       clear_bit(GLF_VERIFY_DELETE, &gl->gl_flags);
        if (cancel_delayed_work(&gl->gl_delete))
                gfs2_glock_put(gl);
 }
@@ -2371,7 +2371,7 @@ static const char *gflags2str(char *buf, const struct gfs2_glock *gl)
                *p++ = 'N';
        if (test_bit(GLF_TRY_TO_EVICT, gflags))
                *p++ = 'e';
-       if (test_bit(GLF_VERIFY_EVICT, gflags))
+       if (test_bit(GLF_VERIFY_DELETE, gflags))
                *p++ = 'E';
        *p = 0;
        return buf;

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index aa4ef67a34e0374e35b8e3f5461e67acab5e67b4..bd1348bff90ebe18ff9846f955c72676a705eb44 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -329,7 +329,7 @@ enum {
        GLF_BLOCKING                    = 15,
        GLF_UNLOCKED                    = 16, /* Wait for glock to be unlocked */
        GLF_TRY_TO_EVICT                = 17, /* iopen glocks only */
-       GLF_VERIFY_EVICT                = 18, /* iopen glocks only */
+       GLF_VERIFY_DELETE               = 18, /* iopen glocks only */
 };
 
 struct gfs2_glock {