mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 15:41:52 +02:00
gfs2: Remove more dead code in add_to_queue
Remove some more dead code in add_to_queue() that commit 0b93bac227
("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 <agruenba@redhat.com>
This commit is contained in:
parent
3774f53d7f
commit
0360faca5d
|
|
@ -1483,7 +1483,6 @@ __acquires(&gl->gl_lockref.lock)
|
|||
{
|
||||
struct gfs2_glock *gl = gh->gh_gl;
|
||||
struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
|
||||
struct list_head *insert_pt = NULL;
|
||||
struct gfs2_holder *gh2;
|
||||
int try_futile = 0;
|
||||
|
||||
|
|
@ -1519,21 +1518,11 @@ __acquires(&gl->gl_lockref.lock)
|
|||
gfs2_holder_wake(gh);
|
||||
return;
|
||||
}
|
||||
if (test_bit(HIF_HOLDER, &gh2->gh_iflags))
|
||||
continue;
|
||||
}
|
||||
trace_gfs2_glock_queue(gh, 1);
|
||||
gfs2_glstats_inc(gl, GFS2_LKS_QCOUNT);
|
||||
gfs2_sbstats_inc(gl, GFS2_LKS_QCOUNT);
|
||||
if (likely(insert_pt == NULL)) {
|
||||
list_add_tail(&gh->gh_list, &gl->gl_holders);
|
||||
return;
|
||||
}
|
||||
list_add_tail(&gh->gh_list, insert_pt);
|
||||
spin_unlock(&gl->gl_lockref.lock);
|
||||
if (sdp->sd_lockstruct.ls_ops->lm_cancel)
|
||||
sdp->sd_lockstruct.ls_ops->lm_cancel(gl);
|
||||
spin_lock(&gl->gl_lockref.lock);
|
||||
list_add_tail(&gh->gh_list, &gl->gl_holders);
|
||||
return;
|
||||
|
||||
trap_recursive:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user