Skip to content

Commit 18d97ff

Browse files
committed
gfs2: Rename GIF_{DEFERRED -> DEFER}_DELETE
jira LE-3201 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.27.1.rt7.368.el8_10 commit-author Andreas Gruenbacher <agruenba@redhat.com> commit 9fb794a 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 <agruenba@redhat.com> (cherry picked from commit 9fb794a) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 7d50152 commit 18d97ff

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
@@ -945,15 +945,15 @@ static bool gfs2_try_evict(struct gfs2_glock *gl)
945945
ip = NULL;
946946
spin_unlock(&gl->gl_lockref.lock);
947947
if (ip) {
948-
set_bit(GIF_DEFERRED_DELETE, &ip->i_flags);
948+
set_bit(GIF_DEFER_DELETE, &ip->i_flags);
949949
d_prune_aliases(&ip->i_inode);
950950
iput(&ip->i_inode);
951951

952952
/* If the inode was evicted, gl->gl_object will now be NULL. */
953953
spin_lock(&gl->gl_lockref.lock);
954954
ip = gl->gl_object;
955955
if (ip) {
956-
clear_bit(GIF_DEFERRED_DELETE, &ip->i_flags);
956+
clear_bit(GIF_DEFER_DELETE, &ip->i_flags);
957957
if (!igrab(&ip->i_inode))
958958
ip = NULL;
959959
}

fs/gfs2/incore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ enum {
384384
GIF_ORDERED = 4,
385385
GIF_FREE_VFS_INODE = 5,
386386
GIF_GLOP_PENDING = 6,
387-
GIF_DEFERRED_DELETE = 7,
387+
GIF_DEFER_DELETE = 7,
388388
};
389389

390390
struct gfs2_inode {

fs/gfs2/super.c

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

1355-
if (test_bit(GIF_DEFERRED_DELETE, &ip->i_flags))
1355+
if (test_bit(GIF_DEFER_DELETE, &ip->i_flags))
13561356
return SHOULD_DEFER_EVICTION;
13571357

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

0 commit comments

Comments
 (0)