[PATCH] xfsprogs: remove unreachable code in libxfs_inode_alloc

[PATCH] xfsprogs: remove unreachable code in libxfs_inode_alloc

[Eric Sandeen]

This code does:

        if (!ialloc_context && !ip)
                return;

        // if !ip here, ialloc_context must be true

        if (ialloc_context) {
                ...
                if (!ip)
                        error = ENOSPC;
                if (error)
                        return error;
                // if !ip in this block we've returned
        }

        // so (!ip) cannot be true here
        if (!ip)
                error = ENOSPC;

(cherry picked this one out of Coverity reports)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/libxfs/util.c b/libxfs/util.c
index 6464a1b..49eb76d 100644
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -700,8 +700,6 @@ libxfs_inode_alloc(
 		if (error)
 			return error;
 	}
-	if (!ip)
-		error = ENOSPC;
 
 	*ipp = ip;
 	return error;

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfsprogs: remove unreachable code in libxfs_inode_alloc

[Brian Foster]

On Mon, Apr 06, 2015 at 12:28:14PM -0500, Eric Sandeen wrote:
> This code does:
> 
>         if (!ialloc_context && !ip)
>                 return;
> 
>         // if !ip here, ialloc_context must be true
> 
>         if (ialloc_context) {
>                 ...
>                 if (!ip)
>                         error = ENOSPC;
>                 if (error)
>                         return error;
>                 // if !ip in this block we've returned
>         }
> 
>         // so (!ip) cannot be true here
>         if (!ip)
>                 error = ENOSPC;
> 
> (cherry picked this one out of Coverity reports)
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

> 
> diff --git a/libxfs/util.c b/libxfs/util.c
> index 6464a1b..49eb76d 100644
> --- a/libxfs/util.c
> +++ b/libxfs/util.c
> @@ -700,8 +700,6 @@ libxfs_inode_alloc(
>  		if (error)
>  			return error;
>  	}
> -	if (!ip)
> -		error = ENOSPC;
>  
>  	*ipp = ip;
>  	return error;
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs