Module Name: src
Committed By: dholland
Date: Thu Jun 6 00:46:40 UTC 2013
Modified Files:
src/sys/ufs: files.ufs
src/sys/ufs/lfs: lfs_alloc.c lfs_balloc.c lfs_inode.c lfs_vfsops.c
ulfs_bswap.h ulfs_extattr.c ulfs_inode.c ulfs_lookup.c ulfs_quota.c
ulfs_quota2.c ulfs_vfsops.c ulfs_vnops.c ulfsmount.h
Log Message:
Split lfs from ufs step 3: rearrange config stuff.
Add new options:
LFS_EI
LFS_DIRHASH
LFS_EXTATTR
LFS_EXTATTR_AUTOSTART
LFS_QUOTA
LFS_QUOTA2
and update code referring to the corresponding FFS and UFS config
symbols to use the LFS versions. Disable the one extant reference
to APPLE_UFS in the ulfs files. Use opt_lfs.h only, not opt_ffs.h.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/files.ufs
cvs rdiff -u -r1.114 -r1.115 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.73 -r1.74 src/sys/ufs/lfs/lfs_balloc.c
cvs rdiff -u -r1.128 -r1.129 src/sys/ufs/lfs/lfs_inode.c
cvs rdiff -u -r1.299 -r1.300 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/lfs/ulfs_bswap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/lfs/ulfs_extattr.c \
src/sys/ufs/lfs/ulfs_inode.c src/sys/ufs/lfs/ulfs_lookup.c \
src/sys/ufs/lfs/ulfs_quota.c src/sys/ufs/lfs/ulfs_quota2.c \
src/sys/ufs/lfs/ulfs_vfsops.c src/sys/ufs/lfs/ulfs_vnops.c \
src/sys/ufs/lfs/ulfsmount.h
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/files.ufs
diff -u src/sys/ufs/files.ufs:1.29 src/sys/ufs/files.ufs:1.30
--- src/sys/ufs/files.ufs:1.29 Wed May 9 00:21:17 2012
+++ src/sys/ufs/files.ufs Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.29 2012/05/09 00:21:17 riastradh Exp $
+# $NetBSD: files.ufs,v 1.30 2013/06/06 00:46:40 dholland Exp $
deffs FFS
deffs EXT2FS
@@ -10,7 +10,10 @@ defflag opt_ffs.h FFS_EI FFS_NO_SNAPSH
UFS_DIRHASH
UFS_EXTATTR UFS_EXTATTR_AUTOSTART
-defflag opt_lfs.h LFS_KERNEL_RFW
+defflag opt_lfs.h LFS_EI LFS_KERNEL_RFW
+ LFS_DIRHASH
+ LFS_EXTATTR LFS_EXTATTR_AUTOSTART
+ LFS_QUOTA LFS_QUOTA2
file ufs/ext2fs/ext2fs_alloc.c ext2fs
file ufs/ext2fs/ext2fs_balloc.c ext2fs
@@ -42,18 +45,18 @@ file ufs/chfs/chfs_subr.c chfs
file ufs/chfs/chfs_vfsops.c chfs
file ufs/chfs/chfs_readinode.c chfs
-file ufs/ffs/ffs_alloc.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_balloc.c ffs | lfs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_alloc.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_balloc.c ffs | mfs | ext2fs | chfs
file ufs/ffs/ffs_bswap.c (ffs | mfs) & ffs_ei
-file ufs/ffs/ffs_inode.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_snapshot.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_subr.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_tables.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_vfsops.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_vnops.c ffs | lfs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_inode.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_snapshot.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_subr.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_tables.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_vfsops.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_vnops.c ffs | mfs | ext2fs | chfs
file ufs/ffs/ffs_wapbl.c ffs & wapbl
file ufs/ffs/ffs_appleufs.c ffs & apple_ufs
-file ufs/ffs/ffs_quota2.c quota2 & (ffs | lfs | mfs | ext2fs | chfs)
+file ufs/ffs/ffs_quota2.c quota2 & (ffs | mfs | ext2fs | chfs)
file ufs/lfs/lfs_alloc.c lfs
file ufs/lfs/lfs_balloc.c lfs
@@ -68,23 +71,38 @@ file ufs/lfs/lfs_subr.c lfs
file ufs/lfs/lfs_syscalls.c lfs
file ufs/lfs/lfs_vfsops.c lfs
file ufs/lfs/lfs_vnops.c lfs
+file ufs/lfs/ulfs_bmap.c lfs
+file ufs/lfs/ulfs_dirhash.c lfs & lfs_dirhash
+file ufs/lfs/ulfs_extattr.c lfs & lfs_extattr
+file ufs/lfs/ulfs_ihash.c lfs
+file ufs/lfs/ulfs_inode.c lfs
+file ufs/lfs/ulfs_lookup.c lfs
+file ufs/lfs/ulfs_quota.c lfs & (lfs_quota | lfs_quota2)
+file ufs/lfs/ulfs_quota1.c lfs & lfs_quota
+file ufs/lfs/ulfs_quota2.c lfs & lfs_quota2
+file ufs/lfs/ulfs_quota1_subr.c lfs
+file ufs/lfs/ulfs_quota2_subr.c lfs & lfs_quota2
+file ufs/lfs/ulfs_rename.c lfs
+file ufs/lfs/ulfs_vfsops.c lfs
+file ufs/lfs/ulfs_vnops.c lfs
+file ufs/lfs/ulfs_wapbl.c lfs
file ufs/mfs/mfs_vfsops.c mfs
file ufs/mfs/mfs_vnops.c mfs
file ufs/mfs/mfs_miniroot.c
-file ufs/ufs/ufs_bmap.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ufs/ufs_dirhash.c (ffs | lfs | mfs | ext2fs | chfs) & ufs_dirhash
+file ufs/ufs/ufs_bmap.c ffs | mfs | ext2fs | chfs
+file ufs/ufs/ufs_dirhash.c (ffs | mfs | ext2fs | chfs) & ufs_dirhash
file ufs/ufs/ufs_extattr.c (ffs | mfs) & ufs_extattr
-file ufs/ufs/ufs_ihash.c ffs | lfs | mfs | ext2fs
-file ufs/ufs/ufs_inode.c ffs | lfs | mfs | ext2fs
-file ufs/ufs/ufs_lookup.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ufs/ufs_quota.c (quota | quota2) & (ffs | lfs | mfs | ext2fs | chfs)
-file ufs/ufs/ufs_quota1.c quota & (ffs | lfs | mfs | ext2fs | chfs)
-file ufs/ufs/ufs_quota2.c quota2 & (ffs | lfs | mfs | ext2fs | chfs)
+file ufs/ufs/ufs_ihash.c ffs | mfs | ext2fs
+file ufs/ufs/ufs_inode.c ffs | mfs | ext2fs
+file ufs/ufs/ufs_lookup.c ffs | mfs | ext2fs | chfs
+file ufs/ufs/ufs_quota.c (quota | quota2) & (ffs | mfs | ext2fs | chfs)
+file ufs/ufs/ufs_quota1.c quota & (ffs | mfs | ext2fs | chfs)
+file ufs/ufs/ufs_quota2.c quota2 & (ffs | mfs | ext2fs | chfs)
file ufs/ufs/quota1_subr.c
-file ufs/ufs/quota2_subr.c quota2 & (ffs | lfs | mfs | ext2fs | chfs)
-file ufs/ufs/ufs_rename.c ffs | lfs | mfs | chfs
-file ufs/ufs/ufs_vfsops.c ffs | lfs | mfs | ext2fs | chfs
-file ufs/ufs/ufs_vnops.c ffs | lfs | mfs | ext2fs | chfs
+file ufs/ufs/quota2_subr.c quota2 & (ffs | mfs | ext2fs | chfs)
+file ufs/ufs/ufs_rename.c ffs | mfs | chfs
+file ufs/ufs/ufs_vfsops.c ffs | mfs | ext2fs | chfs
+file ufs/ufs/ufs_vnops.c ffs | mfs | ext2fs | chfs
file ufs/ufs/ufs_wapbl.c ffs & wapbl
Index: src/sys/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.114 src/sys/ufs/lfs/lfs_alloc.c:1.115
--- src/sys/ufs/lfs/lfs_alloc.c:1.114 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/lfs_alloc.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_alloc.c,v 1.114 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: lfs_alloc.c,v 1.115 2013/06/06 00:46:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.114 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.115 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -337,7 +337,7 @@ lfs_vcreate(struct mount *mp, ino_t ino,
SPLAY_INIT(&ip->i_lfs_lbtree);
ip->i_lfs_nbtree = 0;
LIST_INIT(&ip->i_lfs_segdhd);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
ufsquota_init(ip);
#endif
}
Index: src/sys/ufs/lfs/lfs_balloc.c
diff -u src/sys/ufs/lfs/lfs_balloc.c:1.73 src/sys/ufs/lfs/lfs_balloc.c:1.74
--- src/sys/ufs/lfs/lfs_balloc.c:1.73 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/lfs_balloc.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_balloc.c,v 1.73 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: lfs_balloc.c,v 1.74 2013/06/06 00:46:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.73 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.74 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -411,7 +411,7 @@ lfs_fragextend(struct vnode *vp, int osi
if (bpp && (error = bread(vp, lbn, osize, NOCRED, 0, bpp))) {
goto out;
}
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if ((error = chkdq(ip, frags, cred, 0))) {
if (bpp)
brelse(*bpp, 0);
@@ -429,7 +429,7 @@ lfs_fragextend(struct vnode *vp, int osi
if (!lfs_fits(fs, frags)) {
if (bpp)
brelse(*bpp, 0);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
chkdq(ip, -frags, cred, 0);
#endif
rw_exit(&fs->lfs_fraglock);
Index: src/sys/ufs/lfs/lfs_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.128 src/sys/ufs/lfs/lfs_inode.c:1.129
--- src/sys/ufs/lfs/lfs_inode.c:1.128 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/lfs_inode.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.128 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.129 2013/06/06 00:46:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.128 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.129 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -586,7 +586,7 @@ done:
mutex_exit(&lfs_lock);
oip->i_flag |= IN_CHANGE;
-#ifdef QUOTA
+#ifdef LFS_QUOTA
(void) chkdq(oip, -blocksreleased, NOCRED, 0);
#endif
lfs_reserve(fs, ovp, NULL,
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.299 src/sys/ufs/lfs/lfs_vfsops.c:1.300
--- src/sys/ufs/lfs/lfs_vfsops.c:1.299 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/lfs_vfsops.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.299 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.300 2013/06/06 00:46:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.299 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.300 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -1190,7 +1190,7 @@ lfs_unmount(struct mount *mp, int mntfla
&lfs_lock);
mutex_exit(&lfs_lock);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if ((error = quota1_umount(mp, flags)) != 0)
return (error);
#endif
@@ -1328,7 +1328,7 @@ lfs_sync(struct mount *mp, int waitfor,
DLOG((DLOG_FLUSH, "lfs_sync at 0x%x\n", fs->lfs_offset));
error = lfs_segwrite(mp, SEGM_CKP | (waitfor ? SEGM_SYNC : 0));
lfs_writer_leave(fs);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
qsync(mp);
#endif
return (error);
Index: src/sys/ufs/lfs/ulfs_bswap.h
diff -u src/sys/ufs/lfs/ulfs_bswap.h:1.1 src/sys/ufs/lfs/ulfs_bswap.h:1.2
--- src/sys/ufs/lfs/ulfs_bswap.h:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_bswap.h Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_bswap.h,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_bswap.h,v 1.2 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_bswap.h,v 1.19 2009/10/19 18:41:17 bouyer Exp */
/*
@@ -30,13 +30,13 @@
#define _UFS_UFS_BSWAP_H_
#if defined(_KERNEL_OPT)
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#endif
#include <sys/bswap.h>
/* Macros to access UFS flags */
-#ifdef FFS_EI
+#ifdef LFS_EI
#define UFS_MPNEEDSWAP(ump) ((ump)->um_flags & UFS_NEEDSWAP)
#define UFS_FSNEEDSWAP(fs) ((fs)->fs_flags & FS_SWAPPED)
#define UFS_IPNEEDSWAP(ip) UFS_MPNEEDSWAP((ip)->i_ump)
@@ -46,7 +46,7 @@
#define UFS_IPNEEDSWAP(ip) (0)
#endif
-#if !defined(_KERNEL) || defined(FFS_EI)
+#if !defined(_KERNEL) || defined(LFS_EI)
/* inlines for access to swapped data */
static inline u_int16_t
ufs_rw16(uint16_t a, int ns)
Index: src/sys/ufs/lfs/ulfs_extattr.c
diff -u src/sys/ufs/lfs/ulfs_extattr.c:1.2 src/sys/ufs/lfs/ulfs_extattr.c:1.3
--- src/sys/ufs/lfs/ulfs_extattr.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_extattr.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_extattr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_extattr.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_extattr.c,v 1.41 2012/12/08 13:42:36 manu Exp */
/*-
@@ -49,10 +49,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#ifdef _KERNEL_OPT
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#endif
#include <sys/param.h>
Index: src/sys/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.2 src/sys/ufs/lfs/ulfs_inode.c:1.3
--- src/sys/ufs/lfs/ulfs_inode.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_inode.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_inode.c,v 1.89 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,10 +38,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#include "opt_quota.h"
#include "opt_wapbl.h"
#endif
@@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c
#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/ulfs_wapbl.h>
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
#include <ufs/lfs/ulfs_dirhash.h>
#endif
-#ifdef UFS_EXTATTR
+#ifdef LFS_EXTATTR
#include <ufs/lfs/ulfs_extattr.h>
#endif
@@ -100,7 +100,7 @@ ufs_inactive(void *v)
if (ip->i_mode == 0)
goto out;
if (ip->i_nlink <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
-#ifdef UFS_EXTATTR
+#ifdef LFS_EXTATTR
ufs_extattr_vnode_inactive(vp, curlwp);
#endif
error = UFS_WAPBL_BEGIN(vp->v_mount);
@@ -138,7 +138,7 @@ ufs_inactive(void *v)
if (!error)
error = UFS_TRUNCATE(vp, (off_t)0, 0, NOCRED);
}
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
(void)chkiq(ip, -1, NOCRED, 0);
#endif
DIP_ASSIGN(ip, rdev, 0);
@@ -200,10 +200,10 @@ ufs_reclaim(struct vnode *vp)
vrele(ip->i_devvp);
ip->i_devvp = 0;
}
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
ufsquota_free(ip);
#endif
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (ip->i_dirhash != NULL)
ufsdirhash_free(ip);
#endif
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.2 src/sys/ufs/lfs/ulfs_lookup.c:1.3
--- src/sys/ufs/lfs/ulfs_lookup.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_lookup.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,10 +38,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#ifdef _KERNEL_OPT
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#endif
#include <sys/param.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.
#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/ulfs_dir.h>
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
#include <ufs/lfs/ulfs_dirhash.h>
#endif
#include <ufs/lfs/ulfsmount.h>
@@ -237,7 +237,7 @@ ufs_lookup(void *v)
*/
bmask = vdp->v_mount->mnt_stat.f_iosize - 1;
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
/*
* Use dirhash for fast operations on large directories. The logic
* to determine whether to hash the directory is contained within
@@ -274,7 +274,7 @@ ufs_lookup(void *v)
break;
}
}
-#endif /* UFS_DIRHASH */
+#endif /* LFS_DIRHASH */
if (nameiop != LOOKUP || results->ulr_diroff == 0 ||
results->ulr_diroff >= dp->i_size) {
@@ -391,7 +391,7 @@ searchloop:
if (namlen == cnp->cn_namelen &&
!memcmp(cnp->cn_nameptr, ep->d_name,
(unsigned)namlen)) {
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
foundentry:
#endif
/*
@@ -868,7 +868,7 @@ ufs_direnter(struct vnode *dvp, const st
}
blkoff = ulr->ulr_offset & (ump->um_mountp->mnt_stat.f_iosize - 1);
memcpy((char *)bp->b_data + blkoff, dirp, newentrysize);
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (dp->i_dirhash != NULL) {
ufsdirhash_newblk(dp, ulr->ulr_offset);
ufsdirhash_add(dp, dirp, ulr->ulr_offset);
@@ -953,7 +953,7 @@ ufs_direnter(struct vnode *dvp, const st
}
dsize = DIRSIZ(FSFMT(dvp), nep, needswap);
spacefree += reclen - dsize;
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (dp->i_dirhash != NULL)
ufsdirhash_move(dp, nep,
ulr->ulr_offset + ((char *)nep - dirbuf),
@@ -996,13 +996,13 @@ ufs_direnter(struct vnode *dvp, const st
dirp->d_type = tmp;
}
}
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (dp->i_dirhash != NULL && (ep->d_ino == 0 ||
dirp->d_reclen == spacefree))
ufsdirhash_add(dp, dirp, ulr->ulr_offset + ((char *)ep - dirbuf));
#endif
memcpy((void *)ep, (void *)dirp, (u_int)newentrysize);
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (dp->i_dirhash != NULL)
ufsdirhash_checkblock(dp, dirbuf -
(ulr->ulr_offset & (dirblksiz - 1)),
@@ -1018,7 +1018,7 @@ ufs_direnter(struct vnode *dvp, const st
* lock on the newly entered node.
*/
if (error == 0 && ulr->ulr_endoff && ulr->ulr_endoff < dp->i_size) {
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (dp->i_dirhash != NULL)
ufsdirhash_dirtrunc(dp, ulr->ulr_endoff);
#endif
@@ -1071,7 +1071,7 @@ ufs_dirremove(struct vnode *dvp, const s
struct direct *ep;
struct buf *bp;
int error;
-#ifdef FFS_EI
+#ifdef LFS_EI
const int needswap = UFS_MPNEEDSWAP(dp->i_ump);
#endif
@@ -1094,7 +1094,7 @@ ufs_dirremove(struct vnode *dvp, const s
(off_t)(ulr->ulr_offset - ulr->ulr_count), (void *)&ep, &bp, true)) != 0)
return (error);
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
/*
* Remove the dirhash entry. This is complicated by the fact
* that `ep' is the previous entry when ulr_count != 0.
@@ -1119,7 +1119,7 @@ ufs_dirremove(struct vnode *dvp, const s
needswap);
}
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (dp->i_dirhash != NULL) {
int dirblksiz = ip->i_ump->um_dirblksiz;
ufsdirhash_checkblock(dp, (char *)ep -
Index: src/sys/ufs/lfs/ulfs_quota.c
diff -u src/sys/ufs/lfs/ulfs_quota.c:1.2 src/sys/ufs/lfs/ulfs_quota.c:1.3
--- src/sys/ufs/lfs/ulfs_quota.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_quota.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_quota.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_quota.c,v 1.112 2012/09/09 04:27:49 manu Exp */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -137,11 +137,11 @@ chkdq(struct inode *ip, int64_t change,
if ((ip->i_flags & SF_SNAPSHOT) != 0)
return 0;
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ip->i_ump->um_flags & UFS_QUOTA)
return chkdq1(ip, change, cred, flags);
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ip->i_ump->um_flags & UFS_QUOTA2)
return chkdq2(ip, change, cred, flags);
#endif
@@ -157,11 +157,11 @@ chkiq(struct inode *ip, int32_t change,
/* do not track snapshot usage, or we will deadlock */
if ((ip->i_flags & SF_SNAPSHOT) != 0)
return 0;
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ip->i_ump->um_flags & UFS_QUOTA)
return chkiq1(ip, change, cred, flags);
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ip->i_ump->um_flags & UFS_QUOTA2)
return chkiq2(ip, change, cred, flags);
#endif
@@ -237,7 +237,7 @@ quota_handle_cmd_stat(struct mount *mp,
if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
return EOPNOTSUPP;
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ump->um_flags & UFS_QUOTA) {
strcpy(info->qs_implname, "ufs/ffs quota v1");
info->qs_numidtypes = MAXQUOTAS;
@@ -249,7 +249,7 @@ quota_handle_cmd_stat(struct mount *mp,
info->qs_restrictions |= QUOTA_RESTRICT_32BIT;
} else
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
strcpy(info->qs_implname, "ufs/ffs quota v2");
info->qs_numidtypes = MAXQUOTAS;
@@ -361,12 +361,12 @@ quota_handle_cmd_get(struct mount *mp, s
error = quota_get_auth(mp, l, qk->qk_id);
if (error != 0)
return error;
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ump->um_flags & UFS_QUOTA) {
error = quota1_handle_cmd_get(ump, qk, qv);
} else
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_get(ump, qk, qv);
} else
@@ -408,12 +408,12 @@ quota_handle_cmd_put(struct mount *mp, s
return error;
}
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ump->um_flags & UFS_QUOTA)
error = quota1_handle_cmd_put(ump, qk, qv);
else
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_put(ump, qk, qv);
} else
@@ -454,7 +454,7 @@ quota_handle_cmd_delete(struct mount *mp
NULL);
if (error != 0)
goto err;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_delete(ump, qk);
} else
@@ -497,7 +497,7 @@ quota_handle_cmd_cursorget(struct mount
if (error)
return error;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_cursorget(ump, cursor, keys, vals,
maxnum, ret);
@@ -512,7 +512,7 @@ static int
quota_handle_cmd_cursoropen(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
struct ufsmount *ump = VFSTOUFS(mp);
#endif
struct quotakcursor *cursor;
@@ -526,7 +526,7 @@ quota_handle_cmd_cursoropen(struct mount
if (error)
return error;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_cursoropen(ump, cursor);
} else
@@ -540,7 +540,7 @@ static int
quota_handle_cmd_cursorclose(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
struct ufsmount *ump = VFSTOUFS(mp);
#endif
struct quotakcursor *cursor;
@@ -554,7 +554,7 @@ quota_handle_cmd_cursorclose(struct moun
if (error)
return error;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_cursorclose(ump, cursor);
} else
@@ -568,7 +568,7 @@ static int
quota_handle_cmd_cursorskipidtype(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
struct ufsmount *ump = VFSTOUFS(mp);
#endif
struct quotakcursor *cursor;
@@ -579,7 +579,7 @@ quota_handle_cmd_cursorskipidtype(struct
cursor = args->u.cursorskipidtype.qc_cursor;
idtype = args->u.cursorskipidtype.qc_idtype;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_cursorskipidtype(ump, cursor, idtype);
} else
@@ -593,7 +593,7 @@ static int
quota_handle_cmd_cursoratend(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
struct ufsmount *ump = VFSTOUFS(mp);
#endif
struct quotakcursor *cursor;
@@ -604,7 +604,7 @@ quota_handle_cmd_cursoratend(struct moun
cursor = args->u.cursoratend.qc_cursor;
ret = args->u.cursoratend.qc_ret;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_cursoratend(ump, cursor, ret);
} else
@@ -618,7 +618,7 @@ static int
quota_handle_cmd_cursorrewind(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
struct ufsmount *ump = VFSTOUFS(mp);
#endif
struct quotakcursor *cursor;
@@ -627,7 +627,7 @@ quota_handle_cmd_cursorrewind(struct mou
KASSERT(args->qc_op == QUOTACTL_CURSORREWIND);
cursor = args->u.cursorrewind.qc_cursor;
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
error = quota2_handle_cmd_cursorrewind(ump, cursor);
} else
@@ -658,7 +658,7 @@ quota_handle_cmd_quotaon(struct mount *m
if (error != 0) {
return error;
}
-#ifdef QUOTA
+#ifdef LFS_QUOTA
error = quota1_handle_cmd_quotaon(l, ump, idtype, qfile);
#else
error = EOPNOTSUPP;
@@ -686,7 +686,7 @@ quota_handle_cmd_quotaoff(struct mount *
if (error != 0) {
return error;
}
-#ifdef QUOTA
+#ifdef LFS_QUOTA
error = quota1_handle_cmd_quotaoff(l, ump, idtype);
#else
error = EOPNOTSUPP;
@@ -817,7 +817,7 @@ dqget(struct vnode *vp, u_long id, struc
return (ENODEV);
}
dqvp = ump->um_quotas[type];
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ump->um_flags & UFS_QUOTA) {
if (dqvp == NULLVP || (ump->umq1_qflags[type] & QTF_CLOSING)) {
mutex_exit(&dqlock);
@@ -826,7 +826,7 @@ dqget(struct vnode *vp, u_long id, struc
}
}
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
if (dqvp == NULLVP) {
mutex_exit(&dqlock);
@@ -886,11 +886,11 @@ dqget(struct vnode *vp, u_long id, struc
dqref(dq);
mutex_enter(&dq->dq_interlock);
mutex_exit(&dqlock);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ump->um_flags & UFS_QUOTA)
error = dq1get(dqvp, id, ump, type, dq);
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2)
error = dq2get(dqvp, id, ump, type, dq);
#endif
@@ -945,11 +945,11 @@ dqrele(struct vnode *vp, struct dquot *d
if ((dq->dq_flags & DQ_MOD) == 0)
break;
mutex_exit(&dqlock);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (dq->dq_ump->um_flags & UFS_QUOTA)
(void) dq1sync(vp, dq);
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (dq->dq_ump->um_flags & UFS_QUOTA2)
(void) dq2sync(vp, dq);
#endif
@@ -966,11 +966,11 @@ int
qsync(struct mount *mp)
{
struct ufsmount *ump = VFSTOUFS(mp);
-#ifdef QUOTA
+#ifdef LFS_QUOTA
if (ump->um_flags & UFS_QUOTA)
return q1sync(mp);
#endif
-#ifdef QUOTA2
+#ifdef LFS_QUOTA2
if (ump->um_flags & UFS_QUOTA2)
return q2sync(mp);
#endif
Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.2 src/sys/ufs/lfs/ulfs_quota2.c:1.3
--- src/sys/ufs/lfs/ulfs_quota2.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_quota2.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_quota2.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */
/*-
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -140,7 +140,7 @@ static int
getq2h(struct ufsmount *ump, int type,
struct buf **bpp, struct quota2_header **q2hp, int flags)
{
-#ifdef FFS_EI
+#ifdef LFS_EI
const int needswap = UFS_MPNEEDSWAP(ump);
#endif
int error;
@@ -196,7 +196,7 @@ quota2_walk_list(struct ufsmount *ump, s
uint64_t *offp, int flags, void *a,
int (*func)(struct ufsmount *, uint64_t *, struct quota2_entry *, uint64_t, void *))
{
-#ifdef FFS_EI
+#ifdef LFS_EI
const int needswap = UFS_MPNEEDSWAP(ump);
#endif
daddr_t off = ufs_rw64(*offp, needswap);
@@ -656,7 +656,7 @@ dq2clear_callback(struct ufsmount *ump,
uint64_t off, void *v)
{
struct dq2clear_callback *c = v;
-#ifdef FFS_EI
+#ifdef LFS_EI
const int needswap = UFS_MPNEEDSWAP(ump);
#endif
uint64_t myoff;
@@ -1097,7 +1097,7 @@ q2cursor_getids_callback(struct ufsmount
{
struct q2cursor_getids *gi = v;
id_t id;
-#ifdef FFS_EI
+#ifdef LFS_EI
const int needswap = UFS_MPNEEDSWAP(ump);
#endif
@@ -1508,7 +1508,7 @@ dq2get_callback(struct ufsmount *ump, ui
struct dq2get_callback *c = v;
daddr_t lblkno;
int blkoff;
-#ifdef FFS_EI
+#ifdef LFS_EI
const int needswap = UFS_MPNEEDSWAP(ump);
#endif
Index: src/sys/ufs/lfs/ulfs_vfsops.c
diff -u src/sys/ufs/lfs/ulfs_vfsops.c:1.2 src/sys/ufs/lfs/ulfs_vfsops.c:1.3
--- src/sys/ufs/lfs/ulfs_vfsops.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_vfsops.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vfsops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_vfsops.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_vfsops.c,v 1.52 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,10 +38,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#include "opt_quota.h"
#endif
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.
#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/ulfs_extern.h>
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
#include <ufs/lfs/ulfs_dirhash.h>
#endif
@@ -104,7 +104,7 @@ int
ufs_quotactl(struct mount *mp, struct quotactl_args *args)
{
-#if !defined(QUOTA) && !defined(QUOTA2)
+#if !defined(LFS_QUOTA) && !defined(LFS_QUOTA2)
(void) mp;
(void) args;
return (EOPNOTSUPP);
@@ -247,13 +247,13 @@ ufs_init(void)
"ufsdir", NULL, IPL_NONE, NULL, NULL, NULL);
ufs_ihashinit();
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
dqinit();
#endif
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
ufsdirhash_init();
#endif
-#ifdef UFS_EXTATTR
+#ifdef LFS_EXTATTR
ufs_extattr_init();
#endif
}
@@ -262,7 +262,7 @@ void
ufs_reinit(void)
{
ufs_ihashreinit();
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
dqreinit();
#endif
}
@@ -277,14 +277,14 @@ ufs_done(void)
return;
ufs_ihashdone();
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
dqdone();
#endif
pool_cache_destroy(ufs_direct_cache);
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
ufsdirhash_done();
#endif
-#ifdef UFS_EXTATTR
+#ifdef LFS_EXTATTR
ufs_extattr_done();
#endif
}
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.2 src/sys/ufs/lfs/ulfs_vnops.c:1.3
--- src/sys/ufs/lfs/ulfs_vnops.c:1.2 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/ulfs_vnops.c Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vnops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: ulfs_vnops.c,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufs_vnops.c,v 1.212 2013/03/18 19:35:48 plunky Exp */
/*-
@@ -67,10 +67,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.3 2013/06/06 00:46:40 dholland Exp $");
#if defined(_KERNEL_OPT)
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#include "opt_quota.h"
#endif
@@ -103,7 +103,7 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c
#include <ufs/lfs/ulfs_bswap.h>
#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/ulfs_wapbl.h>
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
#include <ufs/lfs/ulfs_dirhash.h>
#endif
#include <ufs/ext2fs/ext2fs_extern.h>
@@ -296,7 +296,7 @@ static int
ufs_check_possible(struct vnode *vp, struct inode *ip, mode_t mode,
kauth_cred_t cred)
{
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
int error;
#endif
@@ -312,7 +312,7 @@ ufs_check_possible(struct vnode *vp, str
case VREG:
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS);
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
fstrans_start(vp->v_mount, FSTRANS_SHARED);
error = chkdq(ip, 0, cred, 0);
fstrans_done(vp->v_mount);
@@ -720,7 +720,7 @@ ufs_chown(struct vnode *vp, uid_t uid, g
{
struct inode *ip;
int error = 0;
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
uid_t ouid;
gid_t ogid;
int64_t change;
@@ -739,7 +739,7 @@ ufs_chown(struct vnode *vp, uid_t uid, g
return (error);
fstrans_start(vp->v_mount, FSTRANS_SHARED);
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
ogid = ip->i_gid;
ouid = ip->i_uid;
change = DIP(ip, blocks);
@@ -750,7 +750,7 @@ ufs_chown(struct vnode *vp, uid_t uid, g
DIP_ASSIGN(ip, gid, gid);
ip->i_uid = uid;
DIP_ASSIGN(ip, uid, uid);
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
if ((error = chkdq(ip, change, cred, 0)) == 0) {
if ((error = chkiq(ip, 1, cred, 0)) == 0)
goto good;
@@ -766,7 +766,7 @@ ufs_chown(struct vnode *vp, uid_t uid, g
fstrans_done(vp->v_mount);
return (error);
good:
-#endif /* QUOTA || QUOTA2 */
+#endif /* LFS_QUOTA || LFS_QUOTA2 */
ip->i_flag |= IN_CHANGE;
UFS_WAPBL_UPDATE(vp, NULL, NULL, 0);
fstrans_done(vp->v_mount);
@@ -1022,7 +1022,7 @@ ufs_mkdir(void *v)
DIP_ASSIGN(ip, uid, ip->i_uid);
ip->i_gid = dp->i_gid;
DIP_ASSIGN(ip, gid, ip->i_gid);
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
if ((error = chkiq(ip, 1, cnp->cn_cred, 0))) {
UFS_VFREE(tvp, ip->i_number, dmode);
UFS_WAPBL_END(dvp->v_mount);
@@ -1218,7 +1218,7 @@ ufs_rmdir(void *v)
* directory vp so that it will not get locked for recycling
*/
UFS_WAPBL_END(dvp->v_mount);
-#ifdef UFS_DIRHASH
+#ifdef LFS_DIRHASH
if (ip->i_dirhash != NULL)
ufsdirhash_free(ip);
#endif
@@ -1844,7 +1844,7 @@ ufs_makeinode(int mode, struct vnode *dv
vput(dvp);
return (error);
}
-#if defined(QUOTA) || defined(QUOTA2)
+#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
if ((error = chkiq(ip, 1, cnp->cn_cred, 0))) {
UFS_VFREE(tvp, ip->i_number, mode);
UFS_WAPBL_END1(dvp->v_mount, dvp);
Index: src/sys/ufs/lfs/ulfsmount.h
diff -u src/sys/ufs/lfs/ulfsmount.h:1.2 src/sys/ufs/lfs/ulfsmount.h:1.3
--- src/sys/ufs/lfs/ulfsmount.h:1.2 Thu Jun 6 00:44:41 2013
+++ src/sys/ufs/lfs/ulfsmount.h Thu Jun 6 00:46:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfsmount.h,v 1.2 2013/06/06 00:44:41 dholland Exp $ */
+/* $NetBSD: ulfsmount.h,v 1.3 2013/06/06 00:46:40 dholland Exp $ */
/* from NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
/*
@@ -57,7 +57,7 @@ struct mfs_args {
#ifdef _KERNEL
#if defined(_KERNEL_OPT)
-#include "opt_ffs.h"
+#include "opt_lfs.h"
#endif
#include <sys/mutex.h>
@@ -181,7 +181,7 @@ struct ufs_ops {
/* Convert mount ptr to ufsmount ptr. */
#define VFSTOUFS(mp) ((struct ufsmount *)((mp)->mnt_data))
-#ifdef APPLE_UFS
+#if 0 /*def APPLE_UFS*/
#define UFS_MPISAPPLEUFS(ump) ((ump)->um_flags & UFS_ISAPPLEUFS)
#else
#define UFS_MPISAPPLEUFS(ump) (0)
