Commit 595189c2 authored Nov 18, 2020 by Yu Kuai Committed by Darrick J. Wong Nov 18, 2020

xfs: return corresponding errcode if xfs_initialize_perag() fail



In xfs_initialize_perag(), if kmem_zalloc(), xfs_buf_hash_init(), or
radix_tree_preload() failed, the returned value 'error' is not set
accordingly.

Reported-as-fixing: 8b26c582 ("xfs: handle ENOMEM correctly during initialisation of perag structures")
Fixes: 9b247179 ("xfs: cache unlinked pointers in an rhashtable")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent 27c14b5d

fs/xfs/xfs_mount.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -194,20 +194,25 @@ xfs_initialize_perag(
		}

		pag = kmem_zalloc(sizeof(*pag), KM_MAYFAIL);
		if (!pag)
		if (!pag) {
		error = -ENOMEM;
		goto out_unwind_new_pags;
		}
		pag->pag_agno = index;
		pag->pag_mount = mp;
		spin_lock_init(&pag->pag_ici_lock);
		INIT_RADIX_TREE(&pag->pag_ici_root, GFP_ATOMIC);
		if (xfs_buf_hash_init(pag))

		error = xfs_buf_hash_init(pag);
		if (error)
		goto out_free_pag;
		init_waitqueue_head(&pag->pagb_wait);
		spin_lock_init(&pag->pagb_lock);
		pag->pagb_count = 0;
		pag->pagb_tree = RB_ROOT;

		if (radix_tree_preload(GFP_NOFS))
		error = radix_tree_preload(GFP_NOFS);
		if (error)
		goto out_hash_destroy;

		spin_lock(&mp->m_perag_lock);

Admin message