Commit 9fb794aa authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Rename GIF_{DEFERRED -> DEFER}_DELETE 



The GIF_DEFERRED_DELETE flag indicates an action that gfs2_evict_inode()
should take, so rename the flag to GIF_DEFER_DELETE to clarify.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent ee51baa8

fs/gfs2/glock.c

+2 −2
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ static bool gfs2_try_evict(struct gfs2_glock *gl) 
		ip = NULL;

	spin_unlock(&gl->gl_lockref.lock);

	if (ip) {

		set_bit(GIF_DEFERRED_DELETE, &ip->i_flags);

		set_bit(GIF_DEFER_DELETE, &ip->i_flags);

		d_prune_aliases(&ip->i_inode);

		iput(&ip->i_inode);
@@ -988,7 +988,7 @@ static bool gfs2_try_evict(struct gfs2_glock *gl) 
		spin_lock(&gl->gl_lockref.lock);

		ip = gl->gl_object;

		if (ip) {

			clear_bit(GIF_DEFERRED_DELETE, &ip->i_flags);

			clear_bit(GIF_DEFER_DELETE, &ip->i_flags);

			if (!igrab(&ip->i_inode))

				ip = NULL;

		}

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ enum { 
	GIF_SW_PAGED		= 3,

	GIF_FREE_VFS_INODE      = 5,

	GIF_GLOP_PENDING	= 6,

	GIF_DEFERRED_DELETE	= 7,

	GIF_DEFER_DELETE	= 7,

};



struct gfs2_inode {

fs/gfs2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ static enum dinode_demise evict_should_delete(struct inode *inode, 
	if (unlikely(test_bit(GIF_ALLOC_FAILED, &ip->i_flags)))

		goto should_delete;



	if (test_bit(GIF_DEFERRED_DELETE, &ip->i_flags))

	if (test_bit(GIF_DEFER_DELETE, &ip->i_flags))

		return SHOULD_DEFER_EVICTION;



	/* Deletes should never happen under memory pressure anymore.  */