diff options
author | kib <kib@FreeBSD.org> | 2014-07-28 01:08:43 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2014-07-28 01:08:43 +0000 |
commit | 2ac333b7af936f53cccbc105f3b1d454fe3c5dc1 (patch) | |
tree | 3c44ce1ee5b8c0005c0bc7394298fe2f2635ad2e | |
parent | eb32c3f0ff295cf87cfd9dd5edae253b74524b8e (diff) | |
download | FreeBSD-src-2ac333b7af936f53cccbc105f3b1d454fe3c5dc1.zip FreeBSD-src-2ac333b7af936f53cccbc105f3b1d454fe3c5dc1.tar.gz |
MFC r268611:
Replace goto's with the return.
-rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index d8416d8..0c5c29b 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -677,8 +677,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap, * imposed by the system. */ MPASS(dnode->tn_links <= LINK_MAX); if (dnode->tn_links == LINK_MAX) { - error = EMLINK; - goto out; + return (EMLINK); } parent = dnode; @@ -690,14 +689,14 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap, error = tmpfs_alloc_node(tmp, vap->va_type, cnp->cn_cred->cr_uid, dnode->tn_gid, vap->va_mode, parent, target, vap->va_rdev, &node); if (error != 0) - goto out; + return (error); /* Allocate a directory entry that points to the new file. */ error = tmpfs_alloc_dirent(tmp, node, cnp->cn_nameptr, cnp->cn_namelen, &de); if (error != 0) { tmpfs_free_node(tmp, node); - goto out; + return (error); } /* Allocate a vnode for the new file. */ @@ -705,7 +704,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap, if (error != 0) { tmpfs_free_dirent(tmp, de); tmpfs_free_node(tmp, node); - goto out; + return (error); } /* Now that all required items are allocated, we can proceed to @@ -714,10 +713,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap, if (cnp->cn_flags & ISWHITEOUT) tmpfs_dir_whiteout_remove(dvp, cnp); tmpfs_dir_attach(dvp, de); - -out: - - return error; + return (0); } static struct tmpfs_dirent * |