Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 14 Jul 2014 09:02:40 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r268611 - head/sys/fs/tmpfs
Message-ID:  <201407140902.s6E92evV042370@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kib
Date: Mon Jul 14 09:02:40 2014
New Revision: 268611
URL: http://svnweb.freebsd.org/changeset/base/268611

Log:
  In tmpfs_alloc_file(), code after the 'out' label does only 'return
  error;'.  Replace goto's with the return.
  
  Tested by:	pho
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/sys/fs/tmpfs/tmpfs_subr.c

Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c	Mon Jul 14 08:59:25 2014	(r268610)
+++ head/sys/fs/tmpfs/tmpfs_subr.c	Mon Jul 14 09:02:40 2014	(r268611)
@@ -677,8 +677,7 @@ tmpfs_alloc_file(struct vnode *dvp, stru
 		 * 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, stru
 	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, stru
 	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, stru
 	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 *

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407140902.s6E92evV042370>