summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2012-02-20 02:31:27 +0000
committerBen Myers <bpm@sgi.com>2012-02-22 22:26:47 -0600
commita79bf2d75b8f96bcdb6714138cd53cb3c358669c (patch)
tree50c5e40becc5559133c29332f947750fe72529e8 /fs/xfs/xfs_log.c
parentc303c5b8c3b8eace41c4fba26205b50c0f8e4ca0 (diff)
downloadop-kernel-dev-a79bf2d75b8f96bcdb6714138cd53cb3c358669c.zip
op-kernel-dev-a79bf2d75b8f96bcdb6714138cd53cb3c358669c.tar.gz
xfs: add xlog_grant_head_wake_all
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>
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 30fec0a..a0d1376 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -159,6 +159,18 @@ xlog_grant_head_init(
spin_lock_init(&head->lock);
}
+STATIC void
+xlog_grant_head_wake_all(
+ struct xlog_grant_head *head)
+{
+ struct xlog_ticket *tic;
+
+ spin_lock(&head->lock);
+ list_for_each_entry(tic, &head->waiters, t_queue)
+ wake_up_process(tic->t_task);
+ spin_unlock(&head->lock);
+}
+
STATIC bool
xlog_reserveq_wake(
struct log *log,
@@ -3557,7 +3569,6 @@ xfs_log_force_umount(
struct xfs_mount *mp,
int logerror)
{
- xlog_ticket_t *tic;
xlog_t *log;
int retval;
@@ -3625,15 +3636,8 @@ xfs_log_force_umount(
* we don't enqueue anything once the SHUTDOWN flag is set, and this
* action is protected by the grant locks.
*/
- spin_lock(&log->l_reserve_head.lock);
- list_for_each_entry(tic, &log->l_reserve_head.waiters, t_queue)
- wake_up_process(tic->t_task);
- spin_unlock(&log->l_reserve_head.lock);
-
- spin_lock(&log->l_write_head.lock);
- list_for_each_entry(tic, &log->l_write_head.waiters, t_queue)
- wake_up_process(tic->t_task);
- spin_unlock(&log->l_write_head.lock);
+ xlog_grant_head_wake_all(&log->l_reserve_head);
+ xlog_grant_head_wake_all(&log->l_write_head);
if (!(log->l_iclog->ic_state & XLOG_STATE_IOERROR)) {
ASSERT(!logerror);
OpenPOWER on IntegriCloud