Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill off uo_unmark_vnode/UFS_UNMARK_VNODE as it's now a leftover.

This commit is contained in:
dholland 2013-08-11 04:36:17 +00:00
parent 2f193ecc6c
commit 199aad004d
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/ufs/ext2fs/ext2fs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_vfsops.c,v 1.171 2013/06/23 02:06:05 dholland Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.172 2013/08/11 04:36:17 dholland Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.171 2013/06/23 02:06:05 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.172 2013/08/11 04:36:17 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -159,7 +159,6 @@ static const struct ufs_ops ext2fs_ufsops = {
.uo_itimes = ext2fs_itimes,
.uo_update = ext2fs_update,
.uo_vfree = ext2fs_vfree,
.uo_unmark_vnode = (void (*)(vnode_t *))nullop,
};
/* Fill in the inode uid/gid from ext2 halves. */

5
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.286 2013/06/23 22:03:34 dholland Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.287 2013/08/11 04:36:17 dholland Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.286 2013/06/23 22:03:34 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.287 2013/08/11 04:36:17 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@ -173,7 +173,6 @@ static const struct ufs_ops ffs_ufsops = {
.uo_valloc = ffs_valloc,
.uo_vfree = ffs_vfree,
.uo_balloc = ffs_balloc,
.uo_unmark_vnode = (void (*)(vnode_t *))nullop,
.uo_snapgone = ffs_snapgone,
};

8
sys/ufs/ufs/ufs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_vnops.c,v 1.216 2013/06/16 00:13:58 dholland Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.217 2013/08/11 04:36:17 dholland 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.216 2013/06/16 00:13:58 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.217 2013/08/11 04:36:17 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@ -1117,8 +1117,6 @@ ufs_mkdir(void *v)
ip->i_nlink = 0;
DIP_ASSIGN(ip, nlink, 0);
ip->i_flag |= IN_CHANGE;
/* If IN_ADIROP, account for it */
UFS_UNMARK_VNODE(tvp);
UFS_WAPBL_UPDATE(tvp, NULL, NULL, UPDATE_DIROP);
UFS_WAPBL_END(dvp->v_mount);
vput(tvp);
@ -1912,8 +1910,6 @@ ufs_makeinode(int mode, struct vnode *dvp, const struct ufs_lookup_results *ulr,
ip->i_nlink = 0;
DIP_ASSIGN(ip, nlink, 0);
ip->i_flag |= IN_CHANGE;
/* If IN_ADIROP, account for it */
UFS_UNMARK_VNODE(tvp);
UFS_WAPBL_UPDATE(tvp, NULL, NULL, 0);
tvp->v_type = VNON; /* explodes later if VBLK */
UFS_WAPBL_END1(dvp->v_mount, dvp);

5
sys/ufs/ufs/ufsmount.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp $ */
/* $NetBSD: ufsmount.h,v 1.41 2013/08/11 04:36:17 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -138,7 +138,6 @@ struct ufs_ops {
int (*uo_vfree)(struct vnode *, ino_t, int);
int (*uo_balloc)(struct vnode *, off_t, int, kauth_cred_t, int,
struct buf **);
void (*uo_unmark_vnode)(struct vnode *);
void (*uo_snapgone)(struct vnode *);
};
@ -156,8 +155,6 @@ struct ufs_ops {
(*UFS_OPS(vp)->uo_vfree)((vp), (ino), (mode))
#define UFS_BALLOC(vp, off, size, cr, flags, bpp) \
(*UFS_OPS(vp)->uo_balloc)((vp), (off), (size), (cr), (flags), (bpp))
#define UFS_UNMARK_VNODE(vp) \
(*UFS_OPS(vp)->uo_unmark_vnode)((vp))
#define UFS_SNAPGONE(vp) \
(*UFS_OPS(vp)->uo_snapgone)((vp))