Commit 690869a3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nathan Scott

[XFS] rename pagebuf_run_task_queue to pagebuf_run_queues

SGI Modid: 2.5.x-xfs:slinx:134187a
parent 0a358d0e
...@@ -575,7 +575,6 @@ _pagebuf_lookup_pages( ...@@ -575,7 +575,6 @@ _pagebuf_lookup_pages(
return rval; return rval;
} }
/* /*
* Finding and Reading Buffers * Finding and Reading Buffers
*/ */
...@@ -1121,7 +1120,7 @@ _pagebuf_wait_unpin( ...@@ -1121,7 +1120,7 @@ _pagebuf_wait_unpin(
if (atomic_read(&PBP(pb)->pb_pin_count) == 0) { if (atomic_read(&PBP(pb)->pb_pin_count) == 0) {
break; break;
} }
pagebuf_run_task_queue(pb); pagebuf_run_queues(pb);
schedule(); schedule();
} }
remove_wait_queue(&PBP(pb)->pb_waiters, &wait); remove_wait_queue(&PBP(pb)->pb_waiters, &wait);
...@@ -1465,7 +1464,7 @@ pagebuf_iowait( ...@@ -1465,7 +1464,7 @@ pagebuf_iowait(
page_buf_t *pb) page_buf_t *pb)
{ {
PB_TRACE(pb, PB_TRACE_REC(iowait), 0); PB_TRACE(pb, PB_TRACE_REC(iowait), 0);
pagebuf_run_task_queue(pb); pagebuf_run_queues(pb);
down(&pb->pb_iodonesema); down(&pb->pb_iodonesema);
PB_TRACE(pb, PB_TRACE_REC(iowaited), (int)pb->pb_error); PB_TRACE(pb, PB_TRACE_REC(iowaited), (int)pb->pb_error);
return pb->pb_error; return pb->pb_error;
...@@ -1712,7 +1711,7 @@ pagebuf_daemon( ...@@ -1712,7 +1711,7 @@ pagebuf_daemon(
if (as_list_len > 0) if (as_list_len > 0)
purge_addresses(); purge_addresses();
if (count) if (count)
pagebuf_run_task_queue(NULL); pagebuf_run_queues(NULL);
force_flush = 0; force_flush = 0;
} while (pb_daemon->active == 1); } while (pb_daemon->active == 1);
...@@ -1783,7 +1782,7 @@ pagebuf_delwri_flush( ...@@ -1783,7 +1782,7 @@ pagebuf_delwri_flush(
spin_unlock(&pb_daemon->pb_delwrite_lock); spin_unlock(&pb_daemon->pb_delwrite_lock);
pagebuf_run_task_queue(NULL); pagebuf_run_queues(NULL);
if (pinptr) if (pinptr)
*pinptr = pincount; *pinptr = pincount;
......
...@@ -378,12 +378,10 @@ static __inline__ int __pagebuf_iorequest(page_buf_t *pb) ...@@ -378,12 +378,10 @@ static __inline__ int __pagebuf_iorequest(page_buf_t *pb)
return pagebuf_iorequest(pb); return pagebuf_iorequest(pb);
} }
static __inline__ void pagebuf_run_task_queue(page_buf_t *pb) static __inline__ void pagebuf_run_queues(page_buf_t *pb)
{ {
if (pb && (atomic_read(&pb->pb_io_remaining) == 0)) if (!pb || atomic_read(&pb->pb_io_remaining))
return; blk_run_queues();
blk_run_queues();
} }
#endif /* __PAGE_BUF_H__ */ #endif /* __PAGE_BUF_H__ */
...@@ -113,7 +113,7 @@ pagebuf_lock( ...@@ -113,7 +113,7 @@ pagebuf_lock(
ASSERT(pb->pb_flags & _PBF_LOCKABLE); ASSERT(pb->pb_flags & _PBF_LOCKABLE);
PB_TRACE(pb, PB_TRACE_REC(lock), 0); PB_TRACE(pb, PB_TRACE_REC(lock), 0);
pagebuf_run_task_queue(pb); pagebuf_run_queues(pb);
down(&PBP(pb)->pb_sema); down(&PBP(pb)->pb_sema);
PB_SET_OWNER(pb); PB_SET_OWNER(pb);
PB_TRACE(pb, PB_TRACE_REC(locked), 0); PB_TRACE(pb, PB_TRACE_REC(locked), 0);
......
...@@ -210,7 +210,7 @@ static inline int xfs_bawrite(void *mp, page_buf_t *bp) ...@@ -210,7 +210,7 @@ static inline int xfs_bawrite(void *mp, page_buf_t *bp)
bp->pb_strat = xfs_bdstrat_cb; bp->pb_strat = xfs_bdstrat_cb;
xfs_buf_undelay(bp); xfs_buf_undelay(bp);
if ((ret = pagebuf_iostart(bp, PBF_WRITE | PBF_ASYNC)) == 0) if ((ret = pagebuf_iostart(bp, PBF_WRITE | PBF_ASYNC)) == 0)
pagebuf_run_task_queue(bp); pagebuf_run_queues(bp);
return ret; return ret;
} }
...@@ -265,7 +265,7 @@ static inline int XFS_bwrite(page_buf_t *pb) ...@@ -265,7 +265,7 @@ static inline int XFS_bwrite(page_buf_t *pb)
error = pagebuf_iowait(pb); error = pagebuf_iowait(pb);
xfs_buf_relse(pb); xfs_buf_relse(pb);
} else { } else {
pagebuf_run_task_queue(pb); pagebuf_run_queues(pb);
error = 0; error = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment