Commit 487d7c62 authored by Russell Cattelan's avatar Russell Cattelan Committed by Stephen Lord

[XFS] IRIX sets KM_SLEEP to 0 but the support routines sets KM_SLEEP to 1.

So somebodys shortcut on irix is incorrect on linux and results in the sleep
behaviour not being set.

SGI Modid: 2.5.x-xfs:slinx:157773a
parent 200463d7
...@@ -3128,7 +3128,7 @@ xlog_state_ticket_alloc(xlog_t *log) ...@@ -3128,7 +3128,7 @@ xlog_state_ticket_alloc(xlog_t *log)
* The kmem_zalloc may sleep, so we shouldn't be holding the * The kmem_zalloc may sleep, so we shouldn't be holding the
* global lock. XXXmiken: may want to use zone allocator. * global lock. XXXmiken: may want to use zone allocator.
*/ */
buf = (xfs_caddr_t) kmem_zalloc(NBPP, 0); buf = (xfs_caddr_t) kmem_zalloc(NBPP, KM_SLEEP);
s = LOG_LOCK(log); s = LOG_LOCK(log);
......
...@@ -1359,7 +1359,7 @@ xlog_recover_add_item( ...@@ -1359,7 +1359,7 @@ xlog_recover_add_item(
{ {
xlog_recover_item_t *item; xlog_recover_item_t *item;
item = kmem_zalloc(sizeof(xlog_recover_item_t), 0); item = kmem_zalloc(sizeof(xlog_recover_item_t), KM_SLEEP);
xlog_recover_insert_item_backq(itemq, item); xlog_recover_insert_item_backq(itemq, item);
} }
...@@ -1443,7 +1443,7 @@ xlog_recover_add_to_trans( ...@@ -1443,7 +1443,7 @@ xlog_recover_add_to_trans(
item->ri_total = in_f->ilf_size; item->ri_total = in_f->ilf_size;
ASSERT(item->ri_total <= XLOG_MAX_REGIONS_IN_ITEM); ASSERT(item->ri_total <= XLOG_MAX_REGIONS_IN_ITEM);
item->ri_buf = kmem_zalloc((item->ri_total * item->ri_buf = kmem_zalloc((item->ri_total *
sizeof(xfs_log_iovec_t)), 0); sizeof(xfs_log_iovec_t)), KM_SLEEP);
} }
ASSERT(item->ri_total > item->ri_cnt); ASSERT(item->ri_total > item->ri_cnt);
/* Description region is ri_buf[0] */ /* Description region is ri_buf[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