xfs: cleanup xfs_log_space_wake
Remove the now unused opportunistic parameter, and use the the
xlog_writeq_wake and xlog_reserveq_wake helpers now that we don't have
to care about the opportunistic wakeups.
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 9161e8a..2db39df 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -762,18 +762,13 @@
/*
* Wake up processes waiting for log space after we have moved the log tail.
- *
- * If opportunistic is set wake up one waiter even if we do not have enough
- * free space by our strict accounting.
*/
void
xfs_log_space_wake(
- struct xfs_mount *mp,
- bool opportunistic)
+ struct xfs_mount *mp)
{
- struct xlog_ticket *tic;
struct log *log = mp->m_log;
- int need_bytes, free_bytes;
+ int free_bytes;
if (XLOG_FORCED_SHUTDOWN(log))
return;
@@ -783,16 +778,7 @@
spin_lock(&log->l_grant_write_lock);
free_bytes = xlog_space_left(log, &log->l_grant_write_head);
- list_for_each_entry(tic, &log->l_writeq, t_queue) {
- ASSERT(tic->t_flags & XLOG_TIC_PERM_RESERV);
-
- if (free_bytes < tic->t_unit_res && !opportunistic)
- break;
- opportunistic = false;
- free_bytes -= tic->t_unit_res;
- trace_xfs_log_regrant_write_wake_up(log, tic);
- wake_up(&tic->t_wait);
- }
+ xlog_writeq_wake(log, &free_bytes);
spin_unlock(&log->l_grant_write_lock);
}
@@ -801,18 +787,7 @@
spin_lock(&log->l_grant_reserve_lock);
free_bytes = xlog_space_left(log, &log->l_grant_reserve_head);
- list_for_each_entry(tic, &log->l_reserveq, t_queue) {
- if (tic->t_flags & XLOG_TIC_PERM_RESERV)
- need_bytes = tic->t_unit_res*tic->t_cnt;
- else
- need_bytes = tic->t_unit_res;
- if (free_bytes < need_bytes && !opportunistic)
- break;
- opportunistic = false;
- free_bytes -= need_bytes;
- trace_xfs_log_grant_wake_up(log, tic);
- wake_up(&tic->t_wait);
- }
+ xlog_reserveq_wake(log, &free_bytes);
spin_unlock(&log->l_grant_reserve_lock);
}
}
@@ -2748,7 +2723,7 @@
trace_xfs_log_ungrant_exit(log, ticket);
- xfs_log_space_wake(log->l_mp, false);
+ xfs_log_space_wake(log->l_mp);
}
/*