Skip to content

Commit

Permalink
9pfs/9p.c: remove unneeded labels
Browse files Browse the repository at this point in the history
'out' label in v9fs_xattr_write() and 'out_nofid' label in
v9fs_complete_rename() can be replaced by appropriate return
calls.

CC: Greg Kurz <groug@kaod.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Acked-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
  • Loading branch information
danielhb authored and gkurz committed Jan 20, 2020
1 parent ff59c5e commit b858e80
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions hw/9pfs/9p.c
Expand Up @@ -2472,8 +2472,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) {
Expand All @@ -2499,7 +2498,7 @@ static int v9fs_xattr_write(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp,
off += to_copy;
write_count -= to_copy;
}
out:

return err;
}

Expand Down Expand Up @@ -3067,8 +3066,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;
Expand Down Expand Up @@ -3111,7 +3109,6 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp,
put_fid(pdu, dirfidp);
}
v9fs_path_free(&new_path);
out_nofid:
return err;
}

Expand Down

0 comments on commit b858e80

Please sign in to comment.