2019-08-30 01:42:47

by Austin Kim

Subject: [PATCH] xfs: Use WARN_ON_ONCE for bailout mount-operation

If the CONFIG_BUG is enabled, BUG is executed and then system is crashed.
However, the bailout for mount is no longer proceeding.

Using WARN_ON_ONCE rather than BUG can prevent this situation.

Signed-off-by: Austin Kim <[email protected]>
---
fs/xfs/xfs_mount.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 322da69..3ab2acf 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -214,7 +214,7 @@ xfs_initialize_perag(

spin_lock(&mp->m_perag_lock);
if (radix_tree_insert(&mp->m_perag_tree, index, pag)) {
- BUG();
+ WARN_ON_ONCE(1);
spin_unlock(&mp->m_perag_lock);
radix_tree_preload_end();
error = -EEXIST;
--
2.6.2

2019-09-06 12:20:17

by Darrick J. Wong

Subject: Re: [PATCH] xfs: Use WARN_ON_ONCE for bailout mount-operation

On Fri, Aug 30, 2019 at 10:41:10AM +0900, Austin Kim wrote:
> If the CONFIG_BUG is enabled, BUG is executed and then system is crashed.
> However, the bailout for mount is no longer proceeding.
>
> Using WARN_ON_ONCE rather than BUG can prevent this situation.
>
> Signed-off-by: Austin Kim <[email protected]>

Looks ok,
Reviewed-by: Darrick J. Wong <[email protected]>

--D

> ---
> fs/xfs/xfs_mount.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
> index 322da69..3ab2acf 100644
> --- a/fs/xfs/xfs_mount.c
> +++ b/fs/xfs/xfs_mount.c
> @@ -214,7 +214,7 @@ xfs_initialize_perag(
>
> spin_lock(&mp->m_perag_lock);
> if (radix_tree_insert(&mp->m_perag_tree, index, pag)) {
> - BUG();
> + WARN_ON_ONCE(1);
> spin_unlock(&mp->m_perag_lock);
> radix_tree_preload_end();
> error = -EEXIST;
> --
> 2.6.2
>