Skip to content

Commit d74d0ce

Browse files
author
Andreas Gruenbacher
committed
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: Andreas Gruenbacher <agruenba@redhat.com>
1 parent 3278b97 commit d74d0ce

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

fs/gfs2/glock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,12 @@ __acquires(&gl->gl_lockref.lock)
518518
}
519519
}
520520
set_bit(HIF_HOLDER, &gh->gh_iflags);
521-
trace_gfs2_promote(gh, 1);
521+
trace_gfs2_promote(gh);
522522
gfs2_holder_wake(gh);
523523
goto restart;
524524
}
525525
set_bit(HIF_HOLDER, &gh->gh_iflags);
526-
trace_gfs2_promote(gh, 0);
526+
trace_gfs2_promote(gh);
527527
gfs2_holder_wake(gh);
528528
continue;
529529
}

fs/gfs2/trace_gfs2.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,30 +197,27 @@ TRACE_EVENT(gfs2_demote_rq,
197197
/* Promotion/grant of a glock */
198198
TRACE_EVENT(gfs2_promote,
199199

200-
TP_PROTO(const struct gfs2_holder *gh, int first),
200+
TP_PROTO(const struct gfs2_holder *gh),
201201

202-
TP_ARGS(gh, first),
202+
TP_ARGS(gh),
203203

204204
TP_STRUCT__entry(
205205
__field( dev_t, dev )
206206
__field( u64, glnum )
207207
__field( u32, gltype )
208-
__field( int, first )
209208
__field( u8, state )
210209
),
211210

212211
TP_fast_assign(
213212
__entry->dev = gh->gh_gl->gl_name.ln_sbd->sd_vfs->s_dev;
214213
__entry->glnum = gh->gh_gl->gl_name.ln_number;
215214
__entry->gltype = gh->gh_gl->gl_name.ln_type;
216-
__entry->first = first;
217215
__entry->state = glock_trace_state(gh->gh_state);
218216
),
219217

220-
TP_printk("%u,%u glock %u:%llu promote %s %s",
218+
TP_printk("%u,%u glock %u:%llu promote %s",
221219
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->gltype,
222220
(unsigned long long)__entry->glnum,
223-
__entry->first ? "first": "other",
224221
glock_trace_name(__entry->state))
225222
);
226223

0 commit comments

Comments
 (0)