diff mbox

nfs: Fix error path in nfs_options_qdict_to_qapi()

Message ID 20180516161034.27440-1-kwolf@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kevin Wolf May 16, 2018, 4:10 p.m. UTC 
Don't throw away local_err, but propagate it to errp.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/nfs.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Eric Blake May 16, 2018, 4:49 p.m. UTC | #1 
On 05/16/2018 11:10 AM, Kevin Wolf wrote:
> Don't throw away local_err, but propagate it to errp.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>   block/nfs.c | 1 +
>   1 file changed, 1 insertion(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/block/nfs.c b/block/nfs.c
> index d6364d28bb..3349b67a76 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
> @@ -571,6 +571,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
>       qobject_unref(crumpled);
>   
>       if (local_err) {
> +        error_propagate(errp, local_err);
>           return NULL;
>       }
>   
>
Jeff Cody May 16, 2018, 5:10 p.m. UTC | #2 
On Wed, May 16, 2018 at 06:10:34PM +0200, Kevin Wolf wrote:
> Don't throw away local_err, but propagate it to errp.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/nfs.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/block/nfs.c b/block/nfs.c
> index d6364d28bb..3349b67a76 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
> @@ -571,6 +571,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
>      qobject_unref(crumpled);
>  
>      if (local_err) {
> +        error_propagate(errp, local_err);
>          return NULL;
>      }
>  
> -- 
> 2.13.6
> 

Thanks,

Applied to my block branch:

git://github.com/codyprime/qemu-kvm-jtc block

-Jeff
diff mbox

Patch

diff --git a/block/nfs.c b/block/nfs.c
index d6364d28bb..3349b67a76 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -571,6 +571,7 @@  static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
     qobject_unref(crumpled);
 
     if (local_err) {
+        error_propagate(errp, local_err);
         return NULL;
     }