From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763100AbcINOGX (ORCPT ); Wed, 14 Sep 2016 10:06:23 -0400 Received: from mout.web.de ([212.227.17.11]:58113 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758575AbcINOGU (ORCPT ); Wed, 14 Sep 2016 10:06:20 -0400 Subject: [PATCH 07/11] virtio_console: Rename a jump label in port_fops_splice_write() To: virtualization@lists.linux-foundation.org, Amit Shah , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , Rusty Russell References: <566ABCD9.1060404@users.sourceforge.net> <020438b9-a7f8-0050-04c1-43382ba60b75@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Wed, 14 Sep 2016 16:06:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <020438b9-a7f8-0050-04c1-43382ba60b75@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:VWUwlZInj5i/hQgAdKbWyAKNbM+aPdcPrQbenNZddfznGIxlCi3 bh7j8kZwwK2ArsDwTazIehV1c0bOL+rnzYKDUZAhKJvjZVaDXIB3J3h1nj44wcj8YOP5ht2 MQaYY6xJXmyOz0j0CY3vhGSRNXeDX+9NDyP3y5s1xxM2VOJgUclU906c/xTihl5ivEtr7+a V54odlMLRp5F025p6cftg== X-UI-Out-Filterresults: notjunk:1;V01:K0:gLnnINdH4r8=:H7ZE1rtRdeFc6IYOP28JWB YBesHgiztRtwIaqgLtTmNoGSPHUB5nGhVPqFWtTyHnD9lUHr3hPFCb6ipbfgKpFYzEK/XOHAN PClJRAwPmSY2V5sO0Z16vRN8sl3NGXJjMLrOyelN3AuwtQ7gbT4ovrE8qNNeVF3uO/mq58JK0 XTxhMBZBx6t+w0zTYw7tJNbRYnODb+/xCwenVLCefD2aiK170G2r3bpw+A7ls8aiNoCt/QPI7 3VNraAZZemgVkp7NEKh4C8nWE+b1WLLjcPgkFnpfMEW0G6ROUuII5jw6RPRByx3pmtkBiQtN+ RkV232j4Ls8Cr84Zvq1iEXPyo0RUV1oVsbTwCdk1didLjwLfWaf5RaPG1rargWD4C0oB5ZxfF IfVJsoPYwf0r+ucx3avs9j++UpW0aM0SpFNt325cqdZBSbqcilPx08T2MlbK4GXAEiF2XKy1m 1PosLPz0vC0EaiS3C5m6W+WETwb81TFuwuOrxgcRnkkYLxgRprSroL7fx3fN1VeQGjUq6lnH6 RVCd1+y6Yiq8KA0Sc2R6+fMl9Elieid45tIn5LzjL8+i6fVHvOrlZqTaoXyupviJHIC0K6IGu 0vWZvMkX3mH8uqz5CFBWI0jNNDruWVmR+ux3VLpUEeoc8Emyb3NuCPUa/BMnlkXVIweE1BZ3g fbF5pk4MJQkcRjD60mj4ATKqb5CLGMwosOntYEucH+D4vU4yLV/rezUpVenKLW8wkX1UkAJV3 1IUf6KlcSWWOtsNav4t/tcS1aP4YRTPeWPsD+JIV6LYHgyFulBinKNyPlOPNwoft+DFI/PXUj Gj3y+7x Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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