Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-06 05:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gfs2: Remove 'first' trace_gfs2_promote argument

Browse Source 
Remove the 'first' argument of trace_gfs2_promote: with GL_SKIP, the
'first' holder isn't the one that instantiates the glock
(gl_instantiate), which is what the 'first' flag was apparently supposed
to indicate.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
Andreas Gruenbacher 2021-10-05 18:24:36 +02:00
parent 3278b977c9
commit d74d0ce5bc
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/gfs2/glock.c
View File

@ -518,12 +518,12 @@ __acquires(&gl->gl_lockref.lock)
} }
} }
set_bit(HIF_HOLDER, &gh->gh_iflags); set_bit(HIF_HOLDER, &gh->gh_iflags);
trace_gfs2_promote(gh, 1); trace_gfs2_promote(gh);
gfs2_holder_wake(gh); gfs2_holder_wake(gh);
goto restart; goto restart;
} }
set_bit(HIF_HOLDER, &gh->gh_iflags); set_bit(HIF_HOLDER, &gh->gh_iflags);
trace_gfs2_promote(gh, 0); trace_gfs2_promote(gh);
gfs2_holder_wake(gh); gfs2_holder_wake(gh);
continue; continue;
} }

9
fs/gfs2/trace_gfs2.h
View File

@ -197,15 +197,14 @@ TRACE_EVENT(gfs2_demote_rq,
/* Promotion/grant of a glock */ /* Promotion/grant of a glock */
TRACE_EVENT(gfs2_promote, TRACE_EVENT(gfs2_promote,
TP_PROTO(const struct gfs2_holder *gh, int first), TP_PROTO(const struct gfs2_holder *gh),
TP_ARGS(gh, first), TP_ARGS(gh),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( dev_t, dev )
__field( u64, glnum ) __field( u64, glnum )
__field( u32, gltype ) __field( u32, gltype )
__field( int, first )
__field( u8, state ) __field( u8, state )
), ),
@ -213,14 +212,12 @@ TRACE_EVENT(gfs2_promote,
__entry->dev = gh->gh_gl->gl_name.ln_sbd->sd_vfs->s_dev; __entry->dev = gh->gh_gl->gl_name.ln_sbd->sd_vfs->s_dev;
__entry->glnum = gh->gh_gl->gl_name.ln_number; __entry->glnum = gh->gh_gl->gl_name.ln_number;
__entry->gltype = gh->gh_gl->gl_name.ln_type; __entry->gltype = gh->gh_gl->gl_name.ln_type;
__entry->first = first;
__entry->state = glock_trace_state(gh->gh_state); __entry->state = glock_trace_state(gh->gh_state);
), ),
TP_printk("%u,%u glock %u:%llu promote %s %s", TP_printk("%u,%u glock %u:%llu promote %s",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->gltype, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->gltype,
(unsigned long long)__entry->glnum, (unsigned long long)__entry->glnum,
__entry->first ? "first": "other",
glock_trace_name(__entry->state)) glock_trace_name(__entry->state))
); );