Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/libexec/lfs_cleanerd ufs -> ulfs for lfs_cleanerd
details: https://anonhg.NetBSD.org/src/rev/5729bbab2bac
branches: trunk
changeset: 787209:5729bbab2bac
user: dholland <dholland%NetBSD.org@localhost>
date: Thu Jun 06 00:53:35 2013 +0000
description:
ufs -> ulfs for lfs_cleanerd
diffstat:
libexec/lfs_cleanerd/cleansrv.c | 4 ++--
libexec/lfs_cleanerd/coalesce.c | 18 +++++++++---------
libexec/lfs_cleanerd/lfs_cleanerd.c | 22 +++++++++++-----------
3 files changed, 22 insertions(+), 22 deletions(-)
diffs (172 lines):
diff -r 9fcc2b757316 -r 5729bbab2bac libexec/lfs_cleanerd/cleansrv.c
--- a/libexec/lfs_cleanerd/cleansrv.c Thu Jun 06 00:53:12 2013 +0000
+++ b/libexec/lfs_cleanerd/cleansrv.c Thu Jun 06 00:53:35 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cleansrv.c,v 1.3 2008/04/28 20:23:04 martin Exp $ */
+/* $NetBSD: cleansrv.c,v 1.4 2013/06/06 00:53:35 dholland Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/mount.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
#include "bufcache.h"
diff -r 9fcc2b757316 -r 5729bbab2bac libexec/lfs_cleanerd/coalesce.c
--- a/libexec/lfs_cleanerd/coalesce.c Thu Jun 06 00:53:12 2013 +0000
+++ b/libexec/lfs_cleanerd/coalesce.c Thu Jun 06 00:53:35 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: coalesce.c,v 1.20 2013/01/22 09:39:11 dholland Exp $ */
+/* $NetBSD: coalesce.c,v 1.21 2013/06/06 00:53:35 dholland Exp $ */
/*-
* Copyright (c) 2002, 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/wait.h>
#include <sys/mman.h>
-#include <ufs/ufs/dinode.h>
+#include <ufs/lfs/ulfs_dinode.h>
#include <ufs/lfs/lfs.h>
#include <fcntl.h>
@@ -104,13 +104,13 @@
"No such error"
};
-static struct ufs1_dinode *
+static struct ulfs1_dinode *
get_dinode(struct clfs *fs, ino_t ino)
{
IFILE *ifp;
daddr_t daddr;
struct ubuf *bp;
- struct ufs1_dinode *dip, *r;
+ struct ulfs1_dinode *dip, *r;
lfs_ientry(&ifp, fs, ino, &bp);
daddr = ifp->if_daddr;
@@ -120,10 +120,10 @@
return NULL;
bread(fs->clfs_devvp, daddr, fs->lfs_ibsize, NOCRED, 0, &bp);
- for (dip = (struct ufs1_dinode *)bp->b_data;
- dip < (struct ufs1_dinode *)(bp->b_data + fs->lfs_ibsize); dip++)
+ for (dip = (struct ulfs1_dinode *)bp->b_data;
+ dip < (struct ulfs1_dinode *)(bp->b_data + fs->lfs_ibsize); dip++)
if (dip->di_inumber == ino) {
- r = (struct ufs1_dinode *)malloc(sizeof(*r));
+ r = (struct ulfs1_dinode *)malloc(sizeof(*r));
if (r == NULL)
break;
memcpy(r, dip, sizeof(*r));
@@ -144,7 +144,7 @@
BLOCK_INFO *bip = NULL, *tbip;
CLEANERINFO cip;
struct ubuf *bp;
- struct ufs1_dinode *dip;
+ struct ulfs1_dinode *dip;
struct clfs_seguse *sup;
struct lfs_fcntl_markv /* {
BLOCK_INFO *blkiov;
@@ -164,7 +164,7 @@
onb = nb = lblkno(fs, dip->di_size);
/* XXX for now, don't do any file small enough to have fragments */
- if (nb < UFS_NDADDR) {
+ if (nb < ULFS_NDADDR) {
free(dip);
return COALESCE_TOOSMALL;
}
diff -r 9fcc2b757316 -r 5729bbab2bac libexec/lfs_cleanerd/lfs_cleanerd.c
--- a/libexec/lfs_cleanerd/lfs_cleanerd.c Thu Jun 06 00:53:12 2013 +0000
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.c Thu Jun 06 00:53:35 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.32 2013/01/22 09:39:11 dholland Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.33 2013/06/06 00:53:35 dholland Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
#include <assert.h>
@@ -93,7 +93,7 @@
extern u_int32_t cksum(void *, size_t);
extern u_int32_t lfs_sb_cksum(struct dlfs *);
extern u_int32_t lfs_cksum_part(void *, size_t, u_int32_t);
-extern int ufs_getlbns(struct lfs *, struct uvnode *, daddr_t, struct indir *, int *);
+extern int ulfs_getlbns(struct lfs *, struct uvnode *, daddr_t, struct indir *, int *);
/* Compat */
void pwarn(const char *unused, ...) { /* Does nothing */ };
@@ -342,9 +342,9 @@
#ifdef TEST_PATTERN
/*
- * Check UFS_ROOTINO for file data. The assumption is that we are running
+ * Check ULFS_ROOTINO for file data. The assumption is that we are running
* the "twofiles" test with the rest of the filesystem empty. Files
- * created by "twofiles" match the test pattern, but UFS_ROOTINO and the
+ * created by "twofiles" match the test pattern, but ULFS_ROOTINO and the
* executable itself (assumed to be inode 3) should not match.
*/
static void
@@ -355,7 +355,7 @@
/* Check inode sanity */
if (bip->bi_lbn == LFS_UNUSED_LBN) {
- assert(((struct ufs1_dinode *)bip->bi_bp)->di_inumber ==
+ assert(((struct ulfs1_dinode *)bip->bi_bp)->di_inumber ==
bip->bi_inode);
}
@@ -384,7 +384,7 @@
int32_t *iaddrp, idaddr, odaddr;
FINFO *fip;
struct ubuf *ifbp;
- struct ufs1_dinode *dip;
+ struct ulfs1_dinode *dip;
u_int32_t ck, vers;
int fic, inoc, obic;
int i;
@@ -450,7 +450,7 @@
if (inoc < ssp->ss_ninos && *iaddrp == daddr) {
cp = fd_ptrget(fs->clfs_devvp, daddr);
ck = lfs_cksum_part(cp, sizeof(u_int32_t), ck);
- dip = (struct ufs1_dinode *)cp;
+ dip = (struct ulfs1_dinode *)cp;
for (i = 0; i < fs->lfs_inopb; i++) {
if (dip[i].di_inumber == 0)
break;
@@ -950,7 +950,7 @@
check_hidden_cost(struct clfs *fs, BLOCK_INFO *bip, int bic, off_t *ifc)
{
int start;
- struct indir in[UFS_NIADDR + 1];
+ struct indir in[ULFS_NIADDR + 1];
int num;
int i, j, ebic;
BLOCK_INFO *ebip;
@@ -974,10 +974,10 @@
}
if (bip[i].bi_lbn == LFS_UNUSED_LBN)
continue;
- if (bip[i].bi_lbn < UFS_NDADDR)
+ if (bip[i].bi_lbn < ULFS_NDADDR)
continue;
- ufs_getlbns((struct lfs *)fs, NULL, (daddr_t)bip[i].bi_lbn, in, &num);
+ ulfs_getlbns((struct lfs *)fs, NULL, (daddr_t)bip[i].bi_lbn, in, &num);
for (j = 0; j < num; j++) {
check_or_add(bip[i].bi_inode, in[j].in_lbn,
bip + start, bic - start, &ebip, &ebic);
Home |
Main Index |
Thread Index |
Old Index