From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iop13-0003B7-0M for mharc-qemu-trivial@gnu.org; Tue, 07 Jan 2020 08:35:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52428) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ionkg-0007cN-KW for qemu-trivial@nongnu.org; Tue, 07 Jan 2020 07:14:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ionkf-0002RR-IA for qemu-trivial@nongnu.org; Tue, 07 Jan 2020 07:14:26 -0500 Received: from kylie.crudebyte.com ([5.189.157.229]:39153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ionkd-0002PW-42; Tue, 07 Jan 2020 07:14:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=kylie; h=Content-Type:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Content-ID:Content-Description; bh=kHnAvQb+bCtckqXNHiGqjg1vnZNiazUuQfZqot5vWfA=; b=nIwShGu8c7igOKSk1LqI38kgAn MRFEuaHoKlXlOsIAWGht4vXcuUHplGSq/UWrTmg9tlx1r1Wq7PU6yqQcYv91uhmXAgsN8ZQ78XWeF 4XTlLmUWdNX3Ohztk8s4kWkkxOtyo8lC5up6Zwr/dJlY7g5JGYqxI1MYKtzxocr+8Ft5d43ZdsV22 sDBHLmIREZqr6jFOFxvogTbyxANvYuq3YF94ODACU/bHQKQMkD19fYZ1DG4NzRXQi+zGfyP4VKdnc SMEqEjtQQSOn+sutTffft2jDZQFLmeACN0Gz+RYNO5RZKQlgnGqjVPXPJ/0S/r+FSYPus6Ns/gcQt REoRo8XxYbjjMQH5/hKI9mfkHgMWjti3Tl70/LqH+z/Mgarp47Wtj6PgfkhpwzRrkCG9VmQhwpCpZ lonqUQxL9Jtw9e2wDOWMkUK/FJxVgWj/jFeL1vn2IFooV+RQeLHHCBnHS0lLzRUo3nWNcGQzF0tMK oClP/yApl42w4x/Ke6e6kQ3jfVkSlpSNLx/o3SRAxXbHAkeEimCbwQhG/7RplsmuAquHXduz/PmbB /FWO1uNUW0TamNDdP3GpXOmbYMMR3CvrvmOzNXj7R80H3hUAJHLt8AEVhs24hvDJElmocAC8RbHzo M1cSqOn36BfZdAxmQv9fF+1eeYCynm6QPdS4aomXM=; From: Christian Schoenebeck To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , qemu-trivial@nongnu.org, Greg Kurz Subject: Re: [PATCH v1 45/59] 9pfs/9p.c: remove unneeded labels Date: Tue, 07 Jan 2020 13:14:20 +0100 Message-ID: <13045963.Gd4jlxRJ09@silver> In-Reply-To: <20200106182425.20312-46-danielhb413@gmail.com> References: <20200106182425.20312-1-danielhb413@gmail.com> <20200106182425.20312-46-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 5.189.157.229 X-Mailman-Approved-At: Tue, 07 Jan 2020 08:35:23 -0500 X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jan 2020 12:14:29 -0000 On Montag, 6. Januar 2020 19:24:11 CET Daniel Henrique Barboza wrote: > 'out' label in v9fs_xattr_write() and 'out_nofid' label in > v9fs_complete_rename() can be replaced by appropriate return > calls. > > CC: Greg Kurz > Signed-off-by: Daniel Henrique Barboza > --- > hw/9pfs/9p.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index 520177f40c..be2beba4cd 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -2464,8 +2464,7 @@ static int v9fs_xattr_write(V9fsState *s, V9fsPDU > *pdu, V9fsFidState *fidp, > > > if (fidp->fs.xattr.len < off) { > - err = -ENOSPC; > - goto out; > + return -ENOSPC; > } > write_count = fidp->fs.xattr.len - off; > if (write_count > count) { > @@ -2491,7 +2490,7 @@ static int v9fs_xattr_write(V9fsState *s, V9fsPDU > *pdu, V9fsFidState *fidp, off += to_copy; > write_count -= to_copy; > } > -out: > + > return err; > } > > @@ -3056,8 +3055,7 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU > *pdu, V9fsFidState *fidp, if (newdirfid != -1) { > dirfidp = get_fid(pdu, newdirfid); > if (dirfidp == NULL) { > - err = -ENOENT; > - goto out_nofid; > + return -ENOENT; > } > if (fidp->fid_type != P9_FID_NONE) { > err = -EINVAL; > @@ -3100,7 +3098,6 @@ out: > put_fid(pdu, dirfidp); > } > v9fs_path_free(&new_path); > -out_nofid: > return err; > } Same as with patch 44: IMO not any improvement, but also not any behaviour change at least. So it's up to you Greg. Best regards, Christian Schoenebeck