github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-13 15:40:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: merge healthmon insert/push helpers

Browse Source 
These functions are basically the same except for where in the queue the
new event is added.  Refactor them as a single function that takes an
action verb to tell us where; and rename the tracepoints to describe
directly what happens.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Darrick J. Wong 2026-09-01 22:47:28 -07:00 committed by Carlos Maiolino
parent 9097f5c03f
commit 4c98464e12
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fs/xfs/xfs_healthmon.c
View File

@ -270,10 +270,16 @@ xfs_healthmon_merge_events(
return true;
}
/* Insert an event onto the start of the queue. */
enum insert_where {
INSERT_HEAD,
INSERT_TAIL,
};
/* Add an event onto the start or the end of the queue. */
static inline void
__xfs_healthmon_insert(
struct xfs_healthmon *hm,
enum insert_where where,
struct xfs_healthmon_event *event)
{
struct timespec64 now;
@ -283,31 +289,21 @@ __xfs_healthmon_insert(
ktime_get_coarse_real_ts64(&now);
event->time_ns = (now.tv_sec * NSEC_PER_SEC) + now.tv_nsec;
list_add(&event->entry, &hm->event_list);
switch (where) {
case INSERT_HEAD:
trace_xfs_healthmon_insert_head(hm, event);
list_add(&event->entry, &hm->event_list);
break;
case INSERT_TAIL:
trace_xfs_healthmon_insert_tail(hm, event);
list_add_tail(&event->entry, &hm->event_list);
break;
}
xfs_healthmon_bump_events(hm);
wake_up(&hm->wait);
trace_xfs_healthmon_insert(hm, event);
}
/* Push an event onto the end of the queue. */
static inline void
__xfs_healthmon_push(
struct xfs_healthmon *hm,
struct xfs_healthmon_event *event)
{
struct timespec64 now;
lockdep_assert_held(&hm->lock);
ktime_get_coarse_real_ts64(&now);
event->time_ns = (now.tv_sec * NSEC_PER_SEC) + now.tv_nsec;
list_add_tail(&event->entry, &hm->event_list);
xfs_healthmon_bump_events(hm);
wake_up(&hm->wait);
trace_xfs_healthmon_push(hm, event);
}
/* Deal with any previously lost events */
@ -333,7 +329,7 @@ xfs_healthmon_clear_lost_prev(
if (!event)
return -ENOMEM;
__xfs_healthmon_push(hm, event);
__xfs_healthmon_insert(hm, INSERT_TAIL, event);
cleared:
hm->lost_prev_event = 0;
return 0;
@ -386,7 +382,7 @@ xfs_healthmon_push(
goto out_unlock;
}
__xfs_healthmon_push(hm, event);
__xfs_healthmon_insert(hm, INSERT_TAIL, event);
out_unlock:
mutex_unlock(&hm->lock);
@ -415,7 +411,7 @@ xfs_healthmon_unmount(
* we've inserted the unmount event, hm no longer owns that event.
*/
mutex_lock(&hm->lock);
__xfs_healthmon_insert(hm, hm->unmount_event);
__xfs_healthmon_insert(hm, INSERT_HEAD, hm->unmount_event);
hm->unmount_event = NULL;
mutex_unlock(&hm->lock);
@ -1214,7 +1210,7 @@ xfs_ioc_health_monitor(
}
running_event->type = XFS_HEALTHMON_RUNNING;
running_event->domain = XFS_HEALTHMON_MOUNT;
__xfs_healthmon_insert(hm, running_event);
__xfs_healthmon_insert(hm, INSERT_HEAD, running_event);
/*
* Preallocate the unmount event so that we can't fail to notify the

4
fs/xfs/xfs_trace.h
View File

@ -6139,8 +6139,8 @@ DEFINE_EVENT(xfs_healthmon_event_class, name, \
TP_PROTO(const struct xfs_healthmon *hm, \
const struct xfs_healthmon_event *event), \
TP_ARGS(hm, event))
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_insert);
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_push);
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_insert_head);
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_insert_tail);
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_pop);
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_format);
DEFINE_HEALTHMONEVENT_EVENT(xfs_healthmon_format_overflow);