Skip to content

Commit 9fb794a

Browse files
author
Andreas Gruenbacher
committed
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: Andreas Gruenbacher <[email protected]>
1 parent ee51baa commit 9fb794a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

fs/gfs2/glock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,15 +980,15 @@ static bool gfs2_try_evict(struct gfs2_glock *gl)
980980
ip = NULL;
981981
spin_unlock(&gl->gl_lockref.lock);
982982
if (ip) {
983-
set_bit(GIF_DEFERRED_DELETE, &ip->i_flags);
983+
set_bit(GIF_DEFER_DELETE, &ip->i_flags);
984984
d_prune_aliases(&ip->i_inode);
985985
iput(&ip->i_inode);
986986

987987
/* If the inode was evicted, gl->gl_object will now be NULL. */
988988
spin_lock(&gl->gl_lockref.lock);
989989
ip = gl->gl_object;
990990
if (ip) {
991-
clear_bit(GIF_DEFERRED_DELETE, &ip->i_flags);
991+
clear_bit(GIF_DEFER_DELETE, &ip->i_flags);
992992
if (!igrab(&ip->i_inode))
993993
ip = NULL;
994994
}

fs/gfs2/incore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ enum {
376376
GIF_SW_PAGED = 3,
377377
GIF_FREE_VFS_INODE = 5,
378378
GIF_GLOP_PENDING = 6,
379-
GIF_DEFERRED_DELETE = 7,
379+
GIF_DEFER_DELETE = 7,
380380
};
381381

382382
struct gfs2_inode {

fs/gfs2/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ static enum dinode_demise evict_should_delete(struct inode *inode,
13241324
if (unlikely(test_bit(GIF_ALLOC_FAILED, &ip->i_flags)))
13251325
goto should_delete;
13261326

1327-
if (test_bit(GIF_DEFERRED_DELETE, &ip->i_flags))
1327+
if (test_bit(GIF_DEFER_DELETE, &ip->i_flags))
13281328
return SHOULD_DEFER_EVICTION;
13291329

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

0 commit comments

Comments
 (0)