Module Name: src
Committed By: riastradh
Date: Fri Jul 29 22:18:57 UTC 2011
Modified Files:
src/sys/ufs/ufs: ufs_vnops.c
Log Message:
In ufs_rename, declare oldparent and newparent ino_t, not int.
XXX There should be an automatic test for this somewhere.
ok dholland
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/sys/ufs/ufs/ufs_vnops.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/ufs/ufs/ufs_vnops.c
diff -u src/sys/ufs/ufs/ufs_vnops.c:1.200 src/sys/ufs/ufs/ufs_vnops.c:1.201
--- src/sys/ufs/ufs/ufs_vnops.c:1.200 Mon Jul 18 06:45:47 2011
+++ src/sys/ufs/ufs/ufs_vnops.c Fri Jul 29 22:18:56 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -66,7 +66,7 @@
*/
#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"
@@ -1317,7 +1317,8 @@
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;
@@ -1327,7 +1328,8 @@
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;
