CVS commit: src/sys/fs/sysvbfs

[Justin Cormack]

Module Name:    src
Committed By:   justin
Date:           Sun Dec  7 23:48:04 UTC 2014

Modified Files:
        src/sys/fs/sysvbfs: sysvbfs_vfsops.c

Log Message:
Simplify control flow

Removes a variable and compiler warnings in some cases.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/fs/sysvbfs/sysvbfs_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/fs/sysvbfs/sysvbfs_vfsops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.43 src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.44
--- src/sys/fs/sysvbfs/sysvbfs_vfsops.c:1.43	Wed Apr 16 18:55:19 2014
+++ src/sys/fs/sysvbfs/sysvbfs_vfsops.c	Sun Dec  7 23:48:04 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs_vfsops.c,v 1.43 2014/04/16 18:55:19 maxv Exp $	*/
+/*	$NetBSD: sysvbfs_vfsops.c,v 1.44 2014/12/07 23:48:04 justin Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.43 2014/04/16 18:55:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.44 2014/12/07 23:48:04 justin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -168,7 +168,6 @@ sysvbfs_mountfs(struct vnode *devvp, str
 	kauth_cred_t cred = l->l_cred;
 	struct sysvbfs_mount *bmp;
 	int error, oflags;
-	bool devopen = false;
 
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 	error = vinvalbuf(devvp, V_SAVE, cred, l, 0, 0);
@@ -181,13 +180,13 @@ sysvbfs_mountfs(struct vnode *devvp, str
 		oflags |= FWRITE;
 	if ((error = VOP_OPEN(devvp, oflags, NOCRED)) != 0)
 		goto out;
-	devopen = true;
 
 	bmp = malloc(sizeof(*bmp), M_SYSVBFS_VFS, M_WAITOK | M_ZERO);
 	bmp->devvp = devvp;
 	bmp->mountp = mp;
 	if ((error = sysvbfs_bfs_init(&bmp->bfs, devvp)) != 0) {
 		free(bmp, M_SYSVBFS_VFS);
+		VOP_CLOSE(devvp, oflags, NOCRED);
 		goto out;
 	}
 	LIST_INIT(&bmp->bnode_head);
@@ -202,8 +201,6 @@ sysvbfs_mountfs(struct vnode *devvp, str
 	mp->mnt_fs_bshift = BFS_BSHIFT;
 
  out:
-	if (devopen && error)
-		VOP_CLOSE(devvp, oflags, NOCRED);
 	VOP_UNLOCK(devvp);
 	return error;
 }