Commit d74d0ce5 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Remove 'first' trace_gfs2_promote argument 



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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 3278b977

fs/gfs2/glock.c

+2 −2
Original line number Diff line number Diff line
@@ -518,12 +518,12 @@ __acquires(&gl->gl_lockref.lock) 
					}

				}

				set_bit(HIF_HOLDER, &gh->gh_iflags);

				trace_gfs2_promote(gh, 1);

				trace_gfs2_promote(gh);

				gfs2_holder_wake(gh);

				goto restart;

			}

			set_bit(HIF_HOLDER, &gh->gh_iflags);

			trace_gfs2_promote(gh, 0);

			trace_gfs2_promote(gh);

			gfs2_holder_wake(gh);

			continue;

		}

fs/gfs2/trace_gfs2.h

+3 −6
Original line number Diff line number Diff line
@@ -197,15 +197,14 @@ TRACE_EVENT(gfs2_demote_rq, 
/* Promotion/grant of a glock */

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(

		__field(        dev_t,  dev                     )

		__field(	u64,	glnum			)

		__field(	u32,	gltype			)

		__field(	int,	first			)

		__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->glnum	= gh->gh_gl->gl_name.ln_number;

		__entry->gltype	= gh->gh_gl->gl_name.ln_type;

		__entry->first	= first;

		__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,

		  (unsigned long long)__entry->glnum,

		  __entry->first ? "first": "other",

		  glock_trace_name(__entry->state))

);