Fri Jul 29 22:18:57 2011 UTC ()

In ufs_rename, declare oldparent and newparent ino_t, not int.

XXX There should be an automatic test for this somewhere.

ok dholland


(riastradh)

diff -r1.200 -r1.201 src/sys/ufs/ufs/ufs_vnops.c

--- src/sys/ufs/ufs/ufs_vnops.c 2011/07/18 06:45:47	1.200
+++ src/sys/ufs/ufs/ufs_vnops.c 2011/07/29 22:18:56	1.201

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_vnops.c,v 1.200 2011/07/18 06:45:47 dholland Exp $	*/
+/*	$NetBSD: ufs_vnops.c,v 1.201 2011/07/29 22:18:56 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_vnops.c	8.28 (Berkeley) 7/31/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.200 2011/07/18 06:45:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.201 2011/07/29 22:18:56 riastradh Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -1307,37 +1307,39 @@ ufs_rename(void *v)
 	struct vop_rename_args  /* {
 		struct vnode		*a_fdvp;
 		struct vnode		*a_fvp;
 		struct componentname	*a_fcnp;
 		struct vnode		*a_tdvp;
 		struct vnode		*a_tvp;
 		struct componentname	*a_tcnp;
 	} */ *ap = v;
 	struct vnode		*tvp, *tdvp, *fvp, *fdvp;
 	struct componentname	*tcnp, *fcnp;
 	struct inode		*ip, *txp, *fxp, *tdp, *fdp;
 	struct mount		*mp;
 	struct direct		*newdir;
-	int			doingdirectory, oldparent, newparent, error;
+	int			doingdirectory, error;
 	ino_t			oldparent, newparent;
 	struct ufs_lookup_results from_ulr, to_ulr;
 	tvp = ap->a_tvp;
 	tdvp = ap->a_tdvp;
 	fvp = ap->a_fvp;
 	fdvp = ap->a_fdvp;
 	tcnp = ap->a_tcnp;
 	fcnp = ap->a_fcnp;
-	doingdirectory = oldparent = newparent = error = 0;
+	doingdirectory = error = 0;
 	oldparent = newparent = 0;
 	/* save the supplemental lookup results as they currently exist */
 	from_ulr = VTOI(fdvp)->i_crap;
 	to_ulr = VTOI(tdvp)->i_crap;
 	UFS_CHECK_CRAPCOUNTER(VTOI(fdvp));
 	UFS_CHECK_CRAPCOUNTER(VTOI(tdvp));
 	/*
 	 * Owing to VFS oddities we are currently called with tdvp/tvp
 	 * locked and not fdvp/fvp. In a sane world we'd be passed
 	 * tdvp and fdvp only, unlocked, and two name strings. Pretend
 	 * we have a sane world and unlock tdvp and tvp.
 	 */