diff mbox series

xfs: Use WARN_ON_ONCE rather than BUG for bailout mount-operation

Message ID 20190830003022.GA152970@LGEARND20B15
State New
Headers show
Series xfs: Use WARN_ON_ONCE rather than BUG for bailout mount-operation | expand

Commit Message

Austin Kim Aug. 30, 2019, 12:30 a.m. UTC
If the CONFIG_BUG is enabled, BUG is executed and then system is crashed.
However, the bailout for mount is no longer proceeding.

For this reason, using WARN_ON_ONCE rather than BUG can prevent this situation.

Signed-off-by: Austin Kim <austindh.kim@gmail.com>
---
 fs/xfs/xfs_mount.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Darrick J. Wong Aug. 30, 2019, 12:33 a.m. UTC | #1
On Fri, Aug 30, 2019 at 09:30:22AM +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.
> 
> For this reason, using WARN_ON_ONCE rather than BUG can prevent this situation.
> 
> Signed-off-by: Austin Kim <austindh.kim@gmail.com>
> ---
>  fs/xfs/xfs_mount.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
> index 322da69..c0d0b72 100644
> --- a/fs/xfs/xfs_mount.c
> +++ b/fs/xfs/xfs_mount.c
> @@ -213,8 +213,7 @@ xfs_initialize_perag(
>  			goto out_hash_destroy;
>  
>  		spin_lock(&mp->m_perag_lock);
> -		if (radix_tree_insert(&mp->m_perag_tree, index, pag)) {
> -			BUG();
> +		if (WARN_ON_ONCE(radix_tree_insert(&mp->m_perag_tree, index, pag))) {

Er... please wrap the line at 80 columns.

--D

>  			spin_unlock(&mp->m_perag_lock);
>  			radix_tree_preload_end();
>  			error = -EEXIST;
> -- 
> 2.6.2
>
Austin Kim Aug. 30, 2019, 1:37 a.m. UTC | #2
2019년 8월 30일 (금) 오전 9:33, Darrick J. Wong <darrick.wong@oracle.com>님이 작성:
>
> On Fri, Aug 30, 2019 at 09:30:22AM +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.
> >
> > For this reason, using WARN_ON_ONCE rather than BUG can prevent this situation.
> >
> > Signed-off-by: Austin Kim <austindh.kim@gmail.com>
> > ---
> >  fs/xfs/xfs_mount.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
> > index 322da69..c0d0b72 100644
> > --- a/fs/xfs/xfs_mount.c
> > +++ b/fs/xfs/xfs_mount.c
> > @@ -213,8 +213,7 @@ xfs_initialize_perag(
> >                       goto out_hash_destroy;
> >
> >               spin_lock(&mp->m_perag_lock);
> > -             if (radix_tree_insert(&mp->m_perag_tree, index, pag)) {
> > -                     BUG();
> > +             if (WARN_ON_ONCE(radix_tree_insert(&mp->m_perag_tree, index, pag))) {
>
> Er... please wrap the line at 80 columns.

Oh..
Let me resend patch soon after wrapping 80 column lines.

>
> --D
>
> >                       spin_unlock(&mp->m_perag_lock);
> >                       radix_tree_preload_end();
> >                       error = -EEXIST;
> > --
> > 2.6.2
> >
diff mbox series

Patch

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 322da69..c0d0b72 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -213,8 +213,7 @@  xfs_initialize_perag(
 			goto out_hash_destroy;
 
 		spin_lock(&mp->m_perag_lock);
-		if (radix_tree_insert(&mp->m_perag_tree, index, pag)) {
-			BUG();
+		if (WARN_ON_ONCE(radix_tree_insert(&mp->m_perag_tree, index, pag))) {
 			spin_unlock(&mp->m_perag_lock);
 			radix_tree_preload_end();
 			error = -EEXIST;