Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/sys Pull up following revision(s) (requested by manu in t...
details: https://anonhg.NetBSD.org/src/rev/eb440c120c79
branches: netbsd-6
changeset: 774408:eb440c120c79
user: martin <martin%NetBSD.org@localhost>
date: Sun Aug 12 12:59:47 2012 +0000
description:
Pull up following revision(s) (requested by manu in ticket #484):
sys/fs/nilfs/nilfs_vnops.c: revision 1.18
sys/ufs/ufs/ufs_lookup.c: revision 1.117
sys/nfs/nfs_vnops.c: revision 1.295
sys/ufs/chfs/chfs_vnops.c: revision 1.8
sys/ufs/ext2fs/ext2fs_lookup.c: revision 1.70
sys/fs/unionfs/unionfs_vnops.c: revision 1.6
sys/kern/vfs_cache.c: revision 1.89
sys/fs/efs/efs_vnops.c: revision 1.26
sys/fs/hfs/hfs_vnops.c: revision 1.26
sys/fs/adosfs/adlookup.c: revision 1.16
sys/fs/puffs/puffs_vnops.c: revision 1.168
sys/fs/tmpfs/tmpfs_vnops.c: revision 1.98
sys/fs/ntfs/ntfs_vnops.c: revision 1.52
sys/fs/cd9660/cd9660_lookup.c: revision 1.20
sys/fs/msdosfs/msdosfs_lookup.c: revision 1.24
sys/fs/smbfs/smbfs_vnops.c: revision 1.80
sys/fs/udf/udf_vnops.c: revision 1.72
sys/fs/filecorefs/filecore_lookup.c: revision 1.14
sys/fs/puffs/puffs_node.c: revision 1.25
Move some the test for MAKEENTRY into the cache_enter(9). Make some
variables in vfs_cache.c static, __read_mostly, etc.
No objection on tech-kern@.
diffstat:
sys/fs/adosfs/adlookup.c | 8 ++--
sys/fs/cd9660/cd9660_lookup.c | 16 +++-----
sys/fs/efs/efs_vnops.c | 12 ++----
sys/fs/filecorefs/filecore_lookup.c | 16 +++-----
sys/fs/hfs/hfs_vnops.c | 7 +--
sys/fs/msdosfs/msdosfs_lookup.c | 11 ++---
sys/fs/nilfs/nilfs_vnops.c | 6 +-
sys/fs/ntfs/ntfs_vnops.c | 9 ++--
sys/fs/puffs/puffs_node.c | 6 +-
sys/fs/puffs/puffs_vnops.c | 11 ++---
sys/fs/smbfs/smbfs_vnops.c | 28 ++++++----------
sys/fs/tmpfs/tmpfs_vnops.c | 6 +-
sys/fs/udf/udf_vnops.c | 6 +-
sys/fs/unionfs/unionfs_vnops.c | 8 +--
sys/kern/vfs_cache.c | 62 ++++++++++++++++++++----------------
sys/nfs/nfs_vnops.c | 19 +++++-----
sys/ufs/chfs/chfs_vnops.c | 6 +-
sys/ufs/ext2fs/ext2fs_lookup.c | 14 ++++----
sys/ufs/ufs/ufs_lookup.c | 10 ++--
19 files changed, 122 insertions(+), 139 deletions(-)
diffs (truncated from 812 to 300 lines):
diff -r 626f57eca08d -r eb440c120c79 sys/fs/adosfs/adlookup.c
--- a/sys/fs/adosfs/adlookup.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/adosfs/adlookup.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adlookup.c,v 1.15 2010/11/30 10:43:02 dholland Exp $ */
+/* $NetBSD: adlookup.c,v 1.15.14.1 2012/08/12 12:59:49 martin Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adlookup.c,v 1.15 2010/11/30 10:43:02 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adlookup.c,v 1.15.14.1 2012/08/12 12:59:49 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -210,7 +210,7 @@
#endif
return(EJUSTRETURN);
}
- if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+ if (nameiop != CREATE)
cache_enter(vdp, NULL, cnp);
#ifdef ADOSFS_DIAGNOSTIC
printf("ENOENT)");
@@ -240,7 +240,7 @@
if (vdp == *vpp)
vref(vdp);
found_lockdone:
- if ((cnp->cn_flags & MAKEENTRY) && nocache == 0)
+ if (nocache == 0)
cache_enter(vdp, *vpp, cnp);
#ifdef ADOSFS_DIAGNOSTIC
diff -r 626f57eca08d -r eb440c120c79 sys/fs/cd9660/cd9660_lookup.c
--- a/sys/fs/cd9660/cd9660_lookup.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/cd9660/cd9660_lookup.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $ */
+/* $NetBSD: cd9660_lookup.c,v 1.19.8.1 2012/08/12 12:59:50 martin Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.19.8.1 2012/08/12 12:59:50 martin Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@@ -336,11 +336,8 @@
/*
* Insert name into cache (as non-existent) if appropriate.
*/
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(vdp, *vpp, cnp);
- if (nameiop == CREATE || nameiop == RENAME)
- return (EROFS);
- return (ENOENT);
+ cache_enter(vdp, *vpp, cnp);
+ return (nameiop == CREATE || nameiop == RENAME) ? EROFS : ENOENT;
found:
if (numdirpasses == 2)
@@ -402,9 +399,8 @@
/*
* Insert name into cache if appropriate.
*/
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(vdp, *vpp, cnp);
- return (0);
+ cache_enter(vdp, *vpp, cnp);
+ return 0;
}
/*
diff -r 626f57eca08d -r eb440c120c79 sys/fs/efs/efs_vnops.c
--- a/sys/fs/efs/efs_vnops.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/efs/efs_vnops.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efs_vnops.c,v 1.24 2011/05/19 03:11:56 rmind Exp $ */
+/* $NetBSD: efs_vnops.c,v 1.24.10.1 2012/08/12 12:59:49 martin Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble <rumble%ephemeral.org@localhost>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.24 2011/05/19 03:11:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.24.10.1 2012/08/12 12:59:49 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,8 +102,7 @@
err = efs_inode_lookup(VFSTOEFS(ap->a_dvp->v_mount),
EFS_VTOI(ap->a_dvp), ap->a_cnp, &ino);
if (err) {
- if (err == ENOENT && (cnp->cn_flags & MAKEENTRY) &&
- nameiop != CREATE)
+ if (err == ENOENT && nameiop != CREATE)
cache_enter(ap->a_dvp, NULL, cnp);
if (err == ENOENT && (nameiop == CREATE ||
nameiop == RENAME)) {
@@ -121,10 +120,9 @@
*ap->a_vpp = vp;
}
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
+ cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
- return (0);
+ return 0;
}
static int
diff -r 626f57eca08d -r eb440c120c79 sys/fs/filecorefs/filecore_lookup.c
--- a/sys/fs/filecorefs/filecore_lookup.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/filecorefs/filecore_lookup.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_lookup.c,v 1.13 2010/06/24 13:03:09 hannken Exp $ */
+/* $NetBSD: filecore_lookup.c,v 1.13.14.1 2012/08/12 12:59:51 martin Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.13 2010/06/24 13:03:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.13.14.1 2012/08/12 12:59:51 martin Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@@ -246,11 +246,8 @@
/*
* Insert name into cache (as non-existent) if appropriate.
*/
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(vdp, *vpp, cnp);
- if (nameiop == CREATE || nameiop == RENAME)
- return (EROFS);
- return (ENOENT);
+ cache_enter(vdp, *vpp, cnp);
+ return (nameiop == CREATE || nameiop == RENAME) ? EROFS : ENOENT;
found:
if (numdirpasses == 2)
@@ -317,7 +314,6 @@
/*
* Insert name into cache if appropriate.
*/
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(vdp, *vpp, cnp);
- return (0);
+ cache_enter(vdp, *vpp, cnp);
+ return 0;
}
diff -r 626f57eca08d -r eb440c120c79 sys/fs/hfs/hfs_vnops.c
--- a/sys/fs/hfs/hfs_vnops.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/hfs/hfs_vnops.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vnops.c,v 1.24 2011/09/27 01:14:47 christos Exp $ */
+/* $NetBSD: hfs_vnops.c,v 1.24.8.1 2012/08/12 12:59:49 martin Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.24 2011/09/27 01:14:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.24.8.1 2012/08/12 12:59:49 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -474,8 +474,7 @@
*/
/* XXX Cache disabled until we can make sure it works. */
#if 0
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(vdp, *vpp, cnp);
+ cache_enter(vdp, *vpp, cnp);
#endif
error = 0;
diff -r 626f57eca08d -r eb440c120c79 sys/fs/msdosfs/msdosfs_lookup.c
--- a/sys/fs/msdosfs/msdosfs_lookup.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/msdosfs/msdosfs_lookup.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_lookup.c,v 1.23 2010/11/30 10:43:03 dholland Exp $ */
+/* $NetBSD: msdosfs_lookup.c,v 1.23.14.1 2012/08/12 12:59:50 martin Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.23 2010/11/30 10:43:03 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.23.14.1 2012/08/12 12:59:50 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -399,7 +399,7 @@
* e.g. creating a file 'foo' won't invalidate a negative entry
* for 'FOO'.
*/
- if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+ if (nameiop != CREATE)
cache_enter(vdp, *vpp, cnp);
#endif
@@ -553,10 +553,9 @@
/*
* Insert name into cache if appropriate.
*/
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(vdp, *vpp, cnp);
+ cache_enter(vdp, *vpp, cnp);
- return (0);
+ return 0;
}
/*
diff -r 626f57eca08d -r eb440c120c79 sys/fs/nilfs/nilfs_vnops.c
--- a/sys/fs/nilfs/nilfs_vnops.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/nilfs/nilfs_vnops.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.16 2011/11/18 21:18:50 christos Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.16.6.1 2012/08/12 12:59:47 martin Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.16 2011/11/18 21:18:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.16.6.1 2012/08/12 12:59:47 martin Exp $");
#endif /* not lint */
@@ -760,7 +760,7 @@
* the file might not be found and thus putting it into the namecache
* might be seen as negative caching.
*/
- if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+ if (nameiop != CREATE)
cache_enter(dvp, *vpp, cnp);
DPRINTFIF(LOOKUP, error, ("nilfs_lookup returing error %d\n", error));
diff -r 626f57eca08d -r eb440c120c79 sys/fs/ntfs/ntfs_vnops.c
--- a/sys/fs/ntfs/ntfs_vnops.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/ntfs/ntfs_vnops.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_vnops.c,v 1.49.10.1 2012/05/07 03:01:13 riz Exp $ */
+/* $NetBSD: ntfs_vnops.c,v 1.49.10.2 2012/08/12 12:59:50 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.49.10.1 2012/05/07 03:01:13 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.49.10.2 2012/08/12 12:59:50 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -724,10 +724,9 @@
(unsigned long long)VTONT(*ap->a_vpp)->i_number));
}
- if (cnp->cn_flags & MAKEENTRY)
- cache_enter(dvp, *ap->a_vpp, cnp);
+ cache_enter(dvp, *ap->a_vpp, cnp);
- return (error);
+ return error;
}
/*
diff -r 626f57eca08d -r eb440c120c79 sys/fs/puffs/puffs_node.c
--- a/sys/fs/puffs/puffs_node.c Fri Aug 10 12:16:13 2012 +0000
+++ b/sys/fs/puffs/puffs_node.c Sun Aug 12 12:59:47 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_node.c,v 1.23.2.1 2012/04/23 16:49:02 riz Exp $ */
+/* $NetBSD: puffs_node.c,v 1.23.2.2 2012/08/12 12:59:50 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
Home |
Main Index |
Thread Index |
Old Index