Module Name: src Committed By: christos Date: Mon Oct 20 11:58:01 UTC 2014
Modified Files: src/sys/compat/common: vfs_syscalls_30.c Log Message: simplify To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/compat/common/vfs_syscalls_30.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/compat/common/vfs_syscalls_30.c diff -u src/sys/compat/common/vfs_syscalls_30.c:1.35 src/sys/compat/common/vfs_syscalls_30.c:1.36 --- src/sys/compat/common/vfs_syscalls_30.c:1.35 Mon Oct 20 02:56:38 2014 +++ src/sys/compat/common/vfs_syscalls_30.c Mon Oct 20 07:58:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls_30.c,v 1.35 2014/10/20 06:56:38 maxv Exp $ */ +/* $NetBSD: vfs_syscalls_30.c,v 1.36 2014/10/20 11:58:01 christos Exp $ */ /*- * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.35 2014/10/20 06:56:38 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.36 2014/10/20 11:58:01 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -356,12 +356,10 @@ compat_30_sys_getfh(struct lwp *l, const } NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | TRYEMULROOT, pb); error = namei(&nd); - if (error) { - pathbuf_destroy(pb); - return (error); - } - vp = nd.ni_vp; pathbuf_destroy(pb); + if (error) + return error; + vp = nd.ni_vp; sz = sizeof(struct compat_30_fhandle); error = vfs_composefh(vp, (void *)&fh, &sz);