From a8f6aaf0e339f1c3c6c0e013aaf6cb5b179e2119 Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Wed, 17 Jan 2007 21:18:35 -0600 Subject: [PATCH] --- yaml --- r: 46328 b: refs/heads/master c: 4aa0d230c2cfc1ac4bcf7c5466f9943cf14233a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jfs/jfs_lock.h | 2 +- trunk/fs/jfs/jfs_metapage.c | 2 +- trunk/fs/jfs/jfs_txnmgr.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b0650dad5a1f..473562d134fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82d5b9a7c63054a9a2cd838ffd177697f86e7e34 +refs/heads/master: 4aa0d230c2cfc1ac4bcf7c5466f9943cf14233a9 diff --git a/trunk/fs/jfs/jfs_lock.h b/trunk/fs/jfs/jfs_lock.h index 7d78e83d7c40..df48ece4b7a3 100644 --- a/trunk/fs/jfs/jfs_lock.h +++ b/trunk/fs/jfs/jfs_lock.h @@ -42,7 +42,7 @@ do { \ if (cond) \ break; \ unlock_cmd; \ - schedule(); \ + io_schedule(); \ lock_cmd; \ } \ current->state = TASK_RUNNING; \ diff --git a/trunk/fs/jfs/jfs_metapage.c b/trunk/fs/jfs/jfs_metapage.c index ceaf03b94935..58deae007507 100644 --- a/trunk/fs/jfs/jfs_metapage.c +++ b/trunk/fs/jfs/jfs_metapage.c @@ -56,7 +56,7 @@ static inline void __lock_metapage(struct metapage *mp) set_current_state(TASK_UNINTERRUPTIBLE); if (metapage_locked(mp)) { unlock_page(mp->page); - schedule(); + io_schedule(); lock_page(mp->page); } } while (trylock_metapage(mp)); diff --git a/trunk/fs/jfs/jfs_txnmgr.c b/trunk/fs/jfs/jfs_txnmgr.c index d558e51b0df8..6988a1082f58 100644 --- a/trunk/fs/jfs/jfs_txnmgr.c +++ b/trunk/fs/jfs/jfs_txnmgr.c @@ -135,7 +135,7 @@ static inline void TXN_SLEEP_DROP_LOCK(wait_queue_head_t * event) add_wait_queue(event, &wait); set_current_state(TASK_UNINTERRUPTIBLE); TXN_UNLOCK(); - schedule(); + io_schedule(); current->state = TASK_RUNNING; remove_wait_queue(event, &wait); }