diff options
| author | kib <kib@FreeBSD.org> | 2015-01-01 10:44:20 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-01-01 10:44:20 +0000 |
| commit | a355201d21e09aeb2af52ffd0c14f90c6c9f338b (patch) | |
| tree | a2f3efb3e775ec1f6c79f59d8d5d807106d8256b /sys/ufs | |
| parent | 366f16dd6a08d1eeca56a868ab58114d5d5d2069 (diff) | |
| download | FreeBSD-src-a355201d21e09aeb2af52ffd0c14f90c6c9f338b.zip FreeBSD-src-a355201d21e09aeb2af52ffd0c14f90c6c9f338b.tar.gz | |
MFC r275897:
Set NOCACHE flag for CREATE namei() calls, do not specially handle
MAKEENTRY in VOP_LOOKUP().
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_snapshot.c | 3 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_lookup.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 3df8932..099faeb 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -256,7 +256,8 @@ ffs_snapshot(mp, snapfile) * Create the snapshot file. */ restart: - NDINIT(&nd, CREATE, LOCKPARENT | LOCKLEAF, UIO_SYSSPACE, snapfile, td); + NDINIT(&nd, CREATE, LOCKPARENT | LOCKLEAF | NOCACHE, UIO_SYSSPACE, + snapfile, td); if ((error = namei(&nd)) != 0) return (error); if (nd.ni_vp != NULL) { diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 87a030e..b9955f1 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -550,7 +550,7 @@ notfound: /* * Insert name into cache (as non-existent) if appropriate. */ - if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE) + if ((cnp->cn_flags & MAKEENTRY) != 0) cache_enter(vdp, NULL, cnp); return (ENOENT); |
