From a8af315b8bbf2e96ca93c8bee416165bdb92fd10 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 13 Aug 2008 16:51:29 +1000 Subject: [PATCH] --- yaml --- r: 108338 b: refs/heads/master c: d62c251fe4a06144255291cffd68cbadf3bf002f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_mount.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 572fb6b50e31..9878e69b0ef3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff4f038c6bbb27044a84adbcd27bc237d7237e66 +refs/heads/master: d62c251fe4a06144255291cffd68cbadf3bf002f diff --git a/trunk/fs/xfs/xfs_mount.c b/trunk/fs/xfs/xfs_mount.c index 081fb6a02ac3..a4503f5e9497 100644 --- a/trunk/fs/xfs/xfs_mount.c +++ b/trunk/fs/xfs/xfs_mount.c @@ -1052,8 +1052,10 @@ xfs_mountfs( * Allocate and initialize the per-ag data. */ init_rwsem(&mp->m_peraglock); - mp->m_perag = - kmem_zalloc(sbp->sb_agcount * sizeof(xfs_perag_t), KM_SLEEP); + mp->m_perag = kmem_zalloc(sbp->sb_agcount * sizeof(xfs_perag_t), + KM_MAYFAIL); + if (!mp->m_perag) + goto error1; mp->m_maxagi = xfs_initialize_perag(mp, sbp->sb_agcount);