aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_cil.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
-rw-r--r--fs/xfs/xfs_log_cil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index f36f1a2f4dc1..9dc8125d04e5 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -61,7 +61,7 @@ xlog_cil_init(
61 INIT_LIST_HEAD(&cil->xc_committing); 61 INIT_LIST_HEAD(&cil->xc_committing);
62 spin_lock_init(&cil->xc_cil_lock); 62 spin_lock_init(&cil->xc_cil_lock);
63 init_rwsem(&cil->xc_ctx_lock); 63 init_rwsem(&cil->xc_ctx_lock);
64 sv_init(&cil->xc_commit_wait, SV_DEFAULT, "cilwait"); 64 init_waitqueue_head(&cil->xc_commit_wait);
65 65
66 INIT_LIST_HEAD(&ctx->committing); 66 INIT_LIST_HEAD(&ctx->committing);
67 INIT_LIST_HEAD(&ctx->busy_extents); 67 INIT_LIST_HEAD(&ctx->busy_extents);
@@ -563,7 +563,7 @@ restart:
563 * It is still being pushed! Wait for the push to 563 * It is still being pushed! Wait for the push to
564 * complete, then start again from the beginning. 564 * complete, then start again from the beginning.
565 */ 565 */
566 sv_wait(&cil->xc_commit_wait, 0, &cil->xc_cil_lock, 0); 566 xlog_wait(&cil->xc_commit_wait, &cil->xc_cil_lock);
567 goto restart; 567 goto restart;
568 } 568 }
569 } 569 }
@@ -587,7 +587,7 @@ restart:
587 */ 587 */
588 spin_lock(&cil->xc_cil_lock); 588 spin_lock(&cil->xc_cil_lock);
589 ctx->commit_lsn = commit_lsn; 589 ctx->commit_lsn = commit_lsn;
590 sv_broadcast(&cil->xc_commit_wait); 590 wake_up_all(&cil->xc_commit_wait);
591 spin_unlock(&cil->xc_cil_lock); 591 spin_unlock(&cil->xc_cil_lock);
592 592
593 /* release the hounds! */ 593 /* release the hounds! */
@@ -752,7 +752,7 @@ restart:
752 * It is still being pushed! Wait for the push to 752 * It is still being pushed! Wait for the push to
753 * complete, then start again from the beginning. 753 * complete, then start again from the beginning.
754 */ 754 */
755 sv_wait(&cil->xc_commit_wait, 0, &cil->xc_cil_lock, 0); 755 xlog_wait(&cil->xc_commit_wait, &cil->xc_cil_lock);
756 goto restart; 756 goto restart;
757 } 757 }
758 if (ctx->sequence != sequence) 758 if (ctx->sequence != sequence)