From 487d7c62742d243de5d05802ce9984dedb024914 Mon Sep 17 00:00:00 2001 From: Russell Cattelan Date: Mon, 15 Sep 2003 03:03:45 -0500 Subject: [PATCH] [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 --- fs/xfs/xfs_log.c | 2 +- fs/xfs/xfs_log_recover.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 94fad28847014..2040f441050e9 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -3128,7 +3128,7 @@ xlog_state_ticket_alloc(xlog_t *log) * The kmem_zalloc may sleep, so we shouldn't be holding the * 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); diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 1909995fdd498..aa1fb205b6999 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -1359,7 +1359,7 @@ xlog_recover_add_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); } @@ -1443,7 +1443,7 @@ xlog_recover_add_to_trans( item->ri_total = in_f->ilf_size; ASSERT(item->ri_total <= XLOG_MAX_REGIONS_IN_ITEM); 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); /* Description region is ri_buf[0] */ -- 2.53.0