Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/ufs/lfs Add lfs_ or ulfs_ in front of extern symbols lac...
details: https://anonhg.NetBSD.org/src/rev/f1a7c812e3db
branches: trunk
changeset: 787202:f1a7c812e3db
user: dholland <dholland%NetBSD.org@localhost>
date: Thu Jun 06 00:49:28 2013 +0000
description:
Add lfs_ or ulfs_ in front of extern symbols lacking them, mostly
quota-related (and particularly quota2-related) stuff.
diffstat:
sys/ufs/lfs/lfs_balloc.c | 8 +-
sys/ufs/lfs/lfs_inode.c | 6 +-
sys/ufs/lfs/lfs_vfsops.c | 8 +-
sys/ufs/lfs/ulfs_extern.h | 16 ++--
sys/ufs/lfs/ulfs_inode.c | 6 +-
sys/ufs/lfs/ulfs_lookup.c | 12 +-
sys/ufs/lfs/ulfs_quota.c | 142 +++++++++++++++++++-------------------
sys/ufs/lfs/ulfs_quota.h | 64 ++++++++--------
sys/ufs/lfs/ulfs_quota1.c | 108 ++++++++++++++--------------
sys/ufs/lfs/ulfs_quota1.h | 6 +-
sys/ufs/lfs/ulfs_quota1_subr.c | 8 +-
sys/ufs/lfs/ulfs_quota2.c | 152 ++++++++++++++++++++--------------------
sys/ufs/lfs/ulfs_quota2.h | 14 +-
sys/ufs/lfs/ulfs_quota2_subr.c | 20 ++--
sys/ufs/lfs/ulfs_quotacommon.h | 10 +-
sys/ufs/lfs/ulfs_vfsops.c | 14 +-
sys/ufs/lfs/ulfs_vnops.c | 24 +++---
17 files changed, 309 insertions(+), 309 deletions(-)
diffs (truncated from 2080 to 300 lines):
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/lfs_balloc.c
--- a/sys/ufs/lfs/lfs_balloc.c Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/lfs_balloc.c Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_balloc.c,v 1.75 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: lfs_balloc.c,v 1.76 2013/06/06 00:49:28 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.75 2013/06/06 00:48:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.76 2013/06/06 00:49:28 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -412,7 +412,7 @@
goto out;
}
#ifdef LFS_QUOTA
- if ((error = chkdq(ip, frags, cred, 0))) {
+ if ((error = lfs_chkdq(ip, frags, cred, 0))) {
if (bpp)
brelse(*bpp, 0);
goto out;
@@ -430,7 +430,7 @@
if (bpp)
brelse(*bpp, 0);
#ifdef LFS_QUOTA
- chkdq(ip, -frags, cred, 0);
+ lfs_chkdq(ip, -frags, cred, 0);
#endif
rw_exit(&fs->lfs_fraglock);
lfs_availwait(fs, frags);
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/lfs_inode.c
--- a/sys/ufs/lfs/lfs_inode.c Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/lfs_inode.c Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.130 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.131 2013/06/06 00:49:28 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.130 2013/06/06 00:48:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.131 2013/06/06 00:49:28 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -587,7 +587,7 @@
oip->i_flag |= IN_CHANGE;
#ifdef LFS_QUOTA
- (void) chkdq(oip, -blocksreleased, NOCRED, 0);
+ (void) lfs_chkdq(oip, -blocksreleased, NOCRED, 0);
#endif
lfs_reserve(fs, ovp, NULL,
-btofsb(fs, (2 * ULFS_NIADDR + 3) << fs->lfs_bshift));
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/lfs_vfsops.c
--- a/sys/ufs/lfs/lfs_vfsops.c Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/lfs_vfsops.c Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.301 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.302 2013/06/06 00:49:28 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.301 2013/06/06 00:48:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.302 2013/06/06 00:49:28 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -1191,7 +1191,7 @@
mutex_exit(&lfs_lock);
#ifdef LFS_QUOTA
- if ((error = quota1_umount(mp, flags)) != 0)
+ if ((error = lfsquota1_umount(mp, flags)) != 0)
return (error);
#endif
if ((error = vflush(mp, fs->lfs_ivnode, flags)) != 0)
@@ -1329,7 +1329,7 @@
error = lfs_segwrite(mp, SEGM_CKP | (waitfor ? SEGM_SYNC : 0));
lfs_writer_leave(fs);
#ifdef LFS_QUOTA
- qsync(mp);
+ lfs_qsync(mp);
#endif
return (error);
}
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/ulfs_extern.h
--- a/sys/ufs/lfs/ulfs_extern.h Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/ulfs_extern.h Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_extern.h,v 1.2 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: ulfs_extern.h,v 1.3 2013/06/06 00:49:28 dholland Exp $ */
/* from NetBSD: ufs_extern.h,v 1.72 2012/05/09 00:21:18 riastradh Exp */
/*-
@@ -165,23 +165,23 @@
/* ulfs_quota.c */
/*
- * Flags to chkdq() and chkiq()
+ * Flags to lfs_chkdq() and lfs_chkiq()
*/
#define FORCE 0x01 /* force usage changes independent of limits */
void ulfsquota_init(struct inode *);
void ulfsquota_free(struct inode *);
-int chkdq(struct inode *, int64_t, kauth_cred_t, int);
-int chkiq(struct inode *, int32_t, kauth_cred_t, int);
-int quota_handle_cmd(struct mount *, struct lwp *,
+int lfs_chkdq(struct inode *, int64_t, kauth_cred_t, int);
+int lfs_chkiq(struct inode *, int32_t, kauth_cred_t, int);
+int lfsquota_handle_cmd(struct mount *, struct lwp *,
struct quotactl_args *);
-int qsync(struct mount *);
+int lfs_qsync(struct mount *);
/* ulfs_quota1.c */
-int quota1_umount(struct mount *, int);
+int lfsquota1_umount(struct mount *, int);
/* ulfs_quota2.c */
-int quota2_umount(struct mount *, int);
+int lfsquota2_umount(struct mount *, int);
/* ulfs_vfsops.c */
void ulfs_init(void);
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/ulfs_inode.c
--- a/sys/ufs/lfs/ulfs_inode.c Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/ulfs_inode.c Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.4 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.5 2013/06/06 00:49:28 dholland Exp $ */
/* from NetBSD: ufs_inode.c,v 1.89 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.4 2013/06/06 00:48:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.5 2013/06/06 00:49:28 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -139,7 +139,7 @@
error = ULFS_TRUNCATE(vp, (off_t)0, 0, NOCRED);
}
#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
- (void)chkiq(ip, -1, NOCRED, 0);
+ (void)lfs_chkiq(ip, -1, NOCRED, 0);
#endif
DIP_ASSIGN(ip, rdev, 0);
mode = ip->i_mode;
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/ulfs_lookup.c
--- a/sys/ufs/lfs/ulfs_lookup.c Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/ulfs_lookup.c Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.4 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.5 2013/06/06 00:49:28 dholland Exp $ */
/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.4 2013/06/06 00:48:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.5 2013/06/06 00:49:28 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
@@ -72,9 +72,9 @@
#include <miscfs/genfs/genfs.h>
#ifdef DIAGNOSTIC
-int dirchk = 1;
+int lfs_dirchk = 1;
#else
-int dirchk = 0;
+int lfs_dirchk = 0;
#endif
/*
@@ -324,12 +324,12 @@
* Full validation checks are slow, so we only check
* enough to insure forward progress through the
* directory. Complete checks can be run by patching
- * "dirchk" to be true.
+ * "lfs_dirchk" to be true.
*/
KASSERT(bp != NULL);
ep = (struct direct *)((char *)bp->b_data + entryoffsetinblock);
if (ep->d_reclen == 0 ||
- (dirchk && ulfs_dirbadentry(vdp, ep, entryoffsetinblock))) {
+ (lfs_dirchk && ulfs_dirbadentry(vdp, ep, entryoffsetinblock))) {
int i;
ulfs_dirbad(dp, results->ulr_offset, "mangled entry");
diff -r c5a68872b58c -r f1a7c812e3db sys/ufs/lfs/ulfs_quota.c
--- a/sys/ufs/lfs/ulfs_quota.c Thu Jun 06 00:48:04 2013 +0000
+++ b/sys/ufs/lfs/ulfs_quota.c Thu Jun 06 00:49:28 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota.c,v 1.4 2013/06/06 00:48:04 dholland Exp $ */
+/* $NetBSD: ulfs_quota.c,v 1.5 2013/06/06 00:49:28 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.4 2013/06/06 00:48:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.5 2013/06/06 00:49:28 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -58,9 +58,9 @@
#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/ulfs_quota.h>
-kmutex_t dqlock;
-kcondvar_t dqcv;
-const char *quotatypes[ULFS_MAXQUOTAS] = INITQFNAMES;
+kmutex_t lfs_dqlock;
+kcondvar_t lfs_dqcv;
+const char *lfs_quotatypes[ULFS_MAXQUOTAS] = INITQFNAMES;
/*
* Code pertaining to management of the in-core dquot data structures.
@@ -122,7 +122,7 @@
int i;
for (i = 0; i < ULFS_MAXQUOTAS; i++) {
- dqrele(ITOV(ip), ip->i_dquot[i]);
+ lfs_dqrele(ITOV(ip), ip->i_dquot[i]);
ip->i_dquot[i] = NODQUOT;
}
}
@@ -131,7 +131,7 @@
* Update disk usage, and take corrective action.
*/
int
-chkdq(struct inode *ip, int64_t change, kauth_cred_t cred, int flags)
+lfs_chkdq(struct inode *ip, int64_t change, kauth_cred_t cred, int flags)
{
/* do not track snapshot usage, or we will deadlock */
if ((ip->i_flags & SF_SNAPSHOT) != 0)
@@ -139,11 +139,11 @@
#ifdef LFS_QUOTA
if (ip->i_ump->um_flags & ULFS_QUOTA)
- return chkdq1(ip, change, cred, flags);
+ return lfs_chkdq1(ip, change, cred, flags);
#endif
#ifdef LFS_QUOTA2
if (ip->i_ump->um_flags & ULFS_QUOTA2)
- return chkdq2(ip, change, cred, flags);
+ return lfs_chkdq2(ip, change, cred, flags);
#endif
return 0;
}
@@ -152,24 +152,24 @@
* Check the inode limit, applying corrective action.
*/
int
-chkiq(struct inode *ip, int32_t change, kauth_cred_t cred, int flags)
+lfs_chkiq(struct inode *ip, int32_t change, kauth_cred_t cred, int flags)
{
/* do not track snapshot usage, or we will deadlock */
if ((ip->i_flags & SF_SNAPSHOT) != 0)
return 0;
#ifdef LFS_QUOTA
if (ip->i_ump->um_flags & ULFS_QUOTA)
- return chkiq1(ip, change, cred, flags);
+ return lfs_chkiq1(ip, change, cred, flags);
#endif
#ifdef LFS_QUOTA2
if (ip->i_ump->um_flags & ULFS_QUOTA2)
- return chkiq2(ip, change, cred, flags);
+ return lfs_chkiq2(ip, change, cred, flags);
#endif
return 0;
}
int
-quota_handle_cmd(struct mount *mp, struct lwp *l,
+lfsquota_handle_cmd(struct mount *mp, struct lwp *l,
Home |
Main Index |
Thread Index |
Old Index