[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <cb8e64ec-5917-ce0d-cc95-845f8ce0fa34@users.sourceforge.net>
Date: Wed, 14 Sep 2016 16:06:05 +0200
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: virtualization@...ts.linux-foundation.org,
Amit Shah <amit.shah@...hat.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Michael S. Tsirkin" <mst@...hat.com>,
Rusty Russell <rusty@...tcorp.com.au>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org,
Julia Lawall <julia.lawall@...6.fr>
Subject: [PATCH 07/11] virtio_console: Rename a jump label in
port_fops_splice_write()
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Wed, 14 Sep 2016 15:01:51 +0200
Adjust a jump label according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
drivers/char/virtio_console.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 99dc659..d8681d9 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -947,17 +947,17 @@ static ssize_t port_fops_splice_write(struct pipe_inode_info *pipe,
pipe_lock(pipe);
if (!pipe->nrbufs) {
ret = 0;
- goto error_out;
+ goto unlock;
}
ret = wait_port_writable(port, filp->f_flags & O_NONBLOCK);
if (ret < 0)
- goto error_out;
+ goto unlock;
buf = alloc_buf(port->out_vq, 0, pipe->nrbufs);
if (!buf) {
ret = -ENOMEM;
- goto error_out;
+ goto unlock;
}
sgl.n = 0;
@@ -973,8 +973,7 @@ static ssize_t port_fops_splice_write(struct pipe_inode_info *pipe,
if (unlikely(ret <= 0))
free_buf(buf, true);
return ret;
-
-error_out:
+ unlock:
pipe_unlock(pipe);
return ret;
}
--
2.10.0
Powered by blists - more mailing lists