qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <famz@redhat.com>
Subject: [Qemu-devel] [PULL 10/15] nfs: Make errp the last parameter of nfs_client_open
Date: Mon, 24 Apr 2017 09:26:55 +0200	[thread overview]
Message-ID: <1493018820-23445-11-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1493018820-23445-1-git-send-email-armbru@redhat.com>

From: Fam Zheng <famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-10-famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 block/nfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index 0816678..6541dec 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -497,7 +497,7 @@ out:
 
 
 static int64_t nfs_client_open(NFSClient *client, QDict *options,
-                               int flags, Error **errp, int open_flags)
+                               int flags, int open_flags, Error **errp)
 {
     int ret = -EINVAL;
     QemuOpts *opts = NULL;
@@ -663,7 +663,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags,
 
     ret = nfs_client_open(client, options,
                           (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY,
-                          errp, bs->open_flags);
+                          bs->open_flags, errp);
     if (ret < 0) {
         return ret;
     }
@@ -705,7 +705,7 @@ static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp)
         goto out;
     }
 
-    ret = nfs_client_open(client, options, O_CREAT, errp, 0);
+    ret = nfs_client_open(client, options, O_CREAT, 0, errp);
     if (ret < 0) {
         goto out;
     }
-- 
2.7.4

  parent reply	other threads:[~2017-04-24  7:27 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-24  7:26 [Qemu-devel] [PULL 00/15] Error reporting patches for 2017-04-24 Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 01/15] util/error: Fix leak in error_vprepend() Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 02/15] socket: Make errp the last parameter of socket_connect Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 03/15] socket: Make errp the last parameter of inet_connect_saddr Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 04/15] socket: Make errp the last parameter of unix_connect_saddr Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 05/15] socket: Make errp the last parameter of vsock_connect_saddr Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 06/15] block: Make errp the last parameter of bdrv_img_create Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 07/15] crypto: Make errp the last parameter of functions Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 08/15] mirror: Make errp the last parameter of mirror_start_job Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 09/15] block: Make errp the last parameter of commit_active_start Markus Armbruster
2017-04-24  7:26 ` Markus Armbruster [this message]
2017-04-24  7:26 ` [Qemu-devel] [PULL 11/15] fdc: Make errp the last parameter of fdctrl_connect_drives Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 12/15] scsi: Make errp the last parameter of virtio_scsi_common_realize Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 13/15] migration: Make errp the last parameter of local functions Markus Armbruster
2017-04-24  7:26 ` [Qemu-devel] [PULL 14/15] qga: Make errp the last parameter of qga_vss_fsfreeze Markus Armbruster
2017-04-24  7:27 ` [Qemu-devel] [PULL 15/15] error: Apply error_propagate_null.cocci again Markus Armbruster
2017-04-24 14:37 ` [Qemu-devel] [PULL 00/15] Error reporting patches for 2017-04-24 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1493018820-23445-11-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=famz@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).