svn commit: r238539 - head/sys/fs/smbfs

[Christian Brueffer]

Author: brueffer
Date: Mon Jul 16 22:07:29 2012
New Revision: 238539
URL: http://svn.freebsd.org/changeset/base/238539

Log:
  Simply error handling by moving the allocation of np down to where it is
  actually used.  While here, improve style a little.
  
  Submitted by:	mjg
  MFC after:	2 weeks

Modified:
  head/sys/fs/smbfs/smbfs_node.c

Modified: head/sys/fs/smbfs/smbfs_node.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_node.c	Mon Jul 16 20:43:28 2012	(r238538)
+++ head/sys/fs/smbfs/smbfs_node.c	Mon Jul 16 22:07:29 2012	(r238539)
@@ -223,17 +223,15 @@ loop:
 	if (fap == NULL)
 		return ENOENT;
 
-	np = malloc(sizeof *np, M_SMBNODE, M_WAITOK | M_ZERO);
 	error = getnewvnode("smbfs", mp, &smbfs_vnodeops, &vp);
-	if (error) {
-		free(np, M_SMBNODE);
-		return error;
-	}
+	if (error != 0)
+		return (error);
 	error = insmntque(vp, mp);	/* XXX: Too early for mpsafe fs */
-	if (error != 0) {
-		free(np, M_SMBNODE);
+	if (error != 0)
 		return (error);
-	}
+
+	np = malloc(sizeof *np, M_SMBNODE, M_WAITOK | M_ZERO);
+
 	vp->v_type = fap->fa_attr & SMB_FA_DIR ? VDIR : VREG;
 	vp->v_data = np;
 	np->n_vnode = vp;