Skip to content

Commit 0360fac

Browse files
author
Andreas Gruenbacher
committed
gfs2: Remove more dead code in add_to_queue
Remove some more dead code in add_to_queue() that commit 0b93bac ("gfs2: Remove LM_FLAG_PRIORITY flag") has rendered obsolete. This is a continuation of commit 3302764610057 ("gfs2: remove dead code in add_to_queue"); no functional change. Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 3774f53 commit 0360fac

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

fs/gfs2/glock.c

+1-12
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,6 @@ __acquires(&gl->gl_lockref.lock)
14831483
{
14841484
struct gfs2_glock *gl = gh->gh_gl;
14851485
struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
1486-
struct list_head *insert_pt = NULL;
14871486
struct gfs2_holder *gh2;
14881487
int try_futile = 0;
14891488

@@ -1519,21 +1518,11 @@ __acquires(&gl->gl_lockref.lock)
15191518
gfs2_holder_wake(gh);
15201519
return;
15211520
}
1522-
if (test_bit(HIF_HOLDER, &gh2->gh_iflags))
1523-
continue;
15241521
}
15251522
trace_gfs2_glock_queue(gh, 1);
15261523
gfs2_glstats_inc(gl, GFS2_LKS_QCOUNT);
15271524
gfs2_sbstats_inc(gl, GFS2_LKS_QCOUNT);
1528-
if (likely(insert_pt == NULL)) {
1529-
list_add_tail(&gh->gh_list, &gl->gl_holders);
1530-
return;
1531-
}
1532-
list_add_tail(&gh->gh_list, insert_pt);
1533-
spin_unlock(&gl->gl_lockref.lock);
1534-
if (sdp->sd_lockstruct.ls_ops->lm_cancel)
1535-
sdp->sd_lockstruct.ls_ops->lm_cancel(gl);
1536-
spin_lock(&gl->gl_lockref.lock);
1525+
list_add_tail(&gh->gh_list, &gl->gl_holders);
15371526
return;
15381527

15391528
trap_recursive:

0 commit comments

Comments
 (0)