Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/makefs - don't abuse vp->fs to mean struct fs for f...
details: https://anonhg.NetBSD.org/src/rev/d2bca5b6eba3
branches: trunk
changeset: 784524:d2bca5b6eba3
user: christos <christos%NetBSD.org@localhost>
date: Wed Jan 30 19:19:19 2013 +0000
description:
- don't abuse vp->fs to mean struct fs for ffs and struct msdos_opts;
make it always fsinfo_t and change void * to that.
- kill unused structure members.
diffstat:
usr.sbin/makefs/ffs.c | 7 ++-
usr.sbin/makefs/ffs/buf.c | 13 +++----
usr.sbin/makefs/ffs/buf.h | 9 ++---
usr.sbin/makefs/ffs/ffs_alloc.c | 14 +++-----
usr.sbin/makefs/ffs/ffs_balloc.c | 52 +++++++++++++++++-----------------
usr.sbin/makefs/ffs/ufs_inode.h | 4 +-
usr.sbin/makefs/makefs.h | 4 +-
usr.sbin/makefs/msdos.c | 12 +++---
usr.sbin/makefs/msdos/msdosfs_vfsops.c | 4 +-
9 files changed, 58 insertions(+), 61 deletions(-)
diffs (truncated from 469 to 300 lines):
diff -r bee0069cdb1a -r d2bca5b6eba3 usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c Wed Jan 30 19:08:53 2013 +0000
+++ b/usr.sbin/makefs/ffs.c Wed Jan 30 19:19:19 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.58 2013/01/30 17:29:25 christos Exp $ */
+/* $NetBSD: ffs.c,v 1.59 2013/01/30 19:19:19 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.58 2013/01/30 17:29:25 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.59 2013/01/30 19:19:19 christos Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -853,6 +853,7 @@
struct inode in;
struct buf * bp;
ffs_opt_t *ffs_opts = fsopts->fs_specific;
+ struct vnode vp = { fsopts, NULL };
assert (din != NULL);
assert (buf != NULL);
@@ -865,6 +866,7 @@
p = NULL;
in.i_fs = (struct fs *)fsopts->superblock;
+ in.i_devvp = &vp;
if (debug & DEBUG_FS_WRITE_FILE) {
printf(
@@ -885,7 +887,6 @@
else
memcpy(&in.i_din.ffs2_din, &din->ffs2_din,
sizeof(in.i_din.ffs2_din));
- in.i_fd = fsopts->fd;
if (DIP(din, size) == 0)
goto write_inode_and_leave; /* mmm, cheating */
diff -r bee0069cdb1a -r d2bca5b6eba3 usr.sbin/makefs/ffs/buf.c
--- a/usr.sbin/makefs/ffs/buf.c Wed Jan 30 19:08:53 2013 +0000
+++ b/usr.sbin/makefs/ffs/buf.c Wed Jan 30 19:19:19 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.18 2013/01/30 17:29:05 christos Exp $ */
+/* $NetBSD: buf.c,v 1.19 2013/01/30 19:19:19 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: buf.c,v 1.18 2013/01/30 17:29:05 christos Exp $");
+__RCSID("$NetBSD: buf.c,v 1.19 2013/01/30 19:19:19 christos Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -77,10 +77,10 @@
printf("bread: blkno %lld offset %lld bcount %ld\n",
(long long)(*bpp)->b_blkno, (long long) offset,
(*bpp)->b_bcount);
- if (lseek((*bpp)->b_fd, offset, SEEK_SET) == -1)
+ if (lseek((*bpp)->b_fs->fd, offset, SEEK_SET) == -1)
err(1, "bread: lseek %lld (%lld)",
(long long)(*bpp)->b_blkno, (long long)offset);
- rv = read((*bpp)->b_fd, (*bpp)->b_data, (*bpp)->b_bcount);
+ rv = read((*bpp)->b_fs->fd, (*bpp)->b_data, (*bpp)->b_bcount);
if (debug & DEBUG_BUF_BREAD)
printf("bread: read %ld (%lld) returned %d\n",
(*bpp)->b_bcount, (long long)offset, (int)rv);
@@ -138,9 +138,9 @@
if (debug & DEBUG_BUF_BWRITE)
printf("bwrite: blkno %lld offset %lld bcount %d\n",
(long long)bp->b_blkno, (long long) offset, bytes);
- if (lseek(bp->b_fd, offset, SEEK_SET) == -1)
+ if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1)
return (errno);
- rv = write(bp->b_fd, bp->b_data, bytes);
+ rv = write(bp->b_fs->fd, bp->b_data, bytes);
if (debug & DEBUG_BUF_BWRITE)
printf("bwrite: write %ld (offset %lld) returned %lld\n",
bp->b_bcount, (long long)offset, (long long)rv);
@@ -204,7 +204,6 @@
bp = ecalloc(1, sizeof(*bp));
bp->b_bufsize = 0;
bp->b_blkno = bp->b_lblkno = blkno;
- bp->b_fd = vp->fd;
bp->b_fs = vp->fs;
bp->b_data = NULL;
TAILQ_INSERT_HEAD(&buftail, bp, b_tailq);
diff -r bee0069cdb1a -r d2bca5b6eba3 usr.sbin/makefs/ffs/buf.h
--- a/usr.sbin/makefs/ffs/buf.h Wed Jan 30 19:08:53 2013 +0000
+++ b/usr.sbin/makefs/ffs/buf.h Wed Jan 30 19:19:19 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.8 2013/01/30 17:29:05 christos Exp $ */
+/* $NetBSD: buf.h,v 1.9 2013/01/30 19:19:19 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -54,9 +54,9 @@
size_t cn_namelen;
};
+struct makefs_fsinfo;
struct vnode {
- int fd;
- void *fs;
+ struct makefs_fsinfo *fs;
void *v_data;
};
@@ -68,8 +68,7 @@
long b_bcount;
daddr_t b_blkno;
daddr_t b_lblkno;
- int b_fd;
- void * b_fs;
+ struct makefs_fsinfo * b_fs;
TAILQ_ENTRY(buf) b_tailq;
};
diff -r bee0069cdb1a -r d2bca5b6eba3 usr.sbin/makefs/ffs/ffs_alloc.c
--- a/usr.sbin/makefs/ffs/ffs_alloc.c Wed Jan 30 19:08:53 2013 +0000
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c Wed Jan 30 19:19:19 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.22 2013/01/27 20:05:46 christos Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.23 2013/01/30 19:19:19 christos Exp $ */
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
/*
@@ -47,7 +47,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.22 2013/01/27 20:05:46 christos Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.23 2013/01/30 19:19:19 christos Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -304,12 +304,11 @@
int error, frags, allocsiz, i;
struct fs *fs = ip->i_fs;
const int needswap = UFS_FSNEEDSWAP(fs);
- struct vnode vp = { ip->i_fd, ip->i_fs, NULL };
if (fs->fs_cs(fs, cg).cs_nbfree == 0 && size == fs->fs_bsize)
return (0);
- error = bread(&vp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
- NULL, 0, &bp);
+ error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+ (int)fs->fs_cgsize, NULL, 0, &bp);
if (error) {
return (0);
}
@@ -439,7 +438,6 @@
int i, error, cg, blk, frags, bbase;
struct fs *fs = ip->i_fs;
const int needswap = UFS_FSNEEDSWAP(fs);
- struct vnode vp = { ip->i_fd, ip->i_fs, NULL };
if (size > fs->fs_bsize || fragoff(fs, size) != 0 ||
fragnum(fs, bno) + numfrags(fs, size) > fs->fs_frag) {
@@ -452,8 +450,8 @@
(unsigned long long)ip->i_number);
return;
}
- error = bread(&vp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
- NULL, 0, &bp);
+ error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+ (int)fs->fs_cgsize, NULL, 0, &bp);
if (error) {
brelse(bp, 0);
return;
diff -r bee0069cdb1a -r d2bca5b6eba3 usr.sbin/makefs/ffs/ffs_balloc.c
--- a/usr.sbin/makefs/ffs/ffs_balloc.c Wed Jan 30 19:08:53 2013 +0000
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c Wed Jan 30 19:19:19 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_balloc.c,v 1.16 2013/01/27 20:05:46 christos Exp $ */
+/* $NetBSD: ffs_balloc.c,v 1.17 2013/01/30 19:19:19 christos Exp $ */
/* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
/*
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_balloc.c,v 1.16 2013/01/27 20:05:46 christos Exp $");
+__RCSID("$NetBSD: ffs_balloc.c,v 1.17 2013/01/30 19:19:19 christos Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -95,7 +95,6 @@
int32_t *allocblk, allociblk[UFS_NIADDR + 1];
int32_t *allocib;
const int needswap = UFS_FSNEEDSWAP(fs);
- struct vnode vp = { ip->i_fd, ip->i_fs, NULL };
lbn = lblkno(fs, offset);
size = blkoff(fs, offset) + bufsize;
@@ -139,8 +138,8 @@
*/
if (bpp != NULL) {
- error = bread(&vp, lbn, fs->fs_bsize, NULL, 0,
- bpp);
+ error = bread(ip->i_devvp, lbn, fs->fs_bsize,
+ NULL, 0, bpp);
if (error) {
brelse(*bpp, 0);
return (error);
@@ -165,8 +164,8 @@
*/
if (bpp != NULL) {
- error = bread(&vp, lbn, osize, NULL, 0,
- bpp);
+ error = bread(ip->i_devvp, lbn, osize,
+ NULL, 0, bpp);
if (error) {
brelse(*bpp, 0);
return (error);
@@ -195,7 +194,7 @@
if (error)
return (error);
if (bpp != NULL) {
- bp = getblk(&vp, lbn, nsize, 0, 0);
+ bp = getblk(ip->i_devvp, lbn, nsize, 0, 0);
bp->b_blkno = fsbtodb(fs, newb);
clrbuf(bp);
*bpp = bp;
@@ -233,7 +232,7 @@
return error;
nb = newb;
*allocblk++ = nb;
- bp = getblk(&vp, indirs[1].in_lbn, fs->fs_bsize, 0, 0);
+ bp = getblk(ip->i_devvp, indirs[1].in_lbn, fs->fs_bsize, 0, 0);
bp->b_blkno = fsbtodb(fs, nb);
clrbuf(bp);
/*
@@ -251,8 +250,8 @@
*/
for (i = 1;;) {
- error = bread(&vp, indirs[i].in_lbn, fs->fs_bsize, NULL, 0,
- &bp);
+ error = bread(ip->i_devvp, indirs[i].in_lbn, fs->fs_bsize,
+ NULL, 0, &bp);
if (error) {
brelse(bp, 0);
return error;
@@ -275,7 +274,7 @@
}
nb = newb;
*allocblk++ = nb;
- nbp = getblk(&vp, indirs[i].in_lbn, fs->fs_bsize, 0, 0);
+ nbp = getblk(ip->i_devvp, indirs[i].in_lbn, fs->fs_bsize, 0, 0);
nbp->b_blkno = fsbtodb(fs, nb);
clrbuf(nbp);
/*
@@ -306,7 +305,7 @@
nb = newb;
*allocblk++ = nb;
if (bpp != NULL) {
- nbp = getblk(&vp, lbn, fs->fs_bsize, 0, 0);
+ nbp = getblk(ip->i_devvp, lbn, fs->fs_bsize, 0, 0);
nbp->b_blkno = fsbtodb(fs, nb);
clrbuf(nbp);
*bpp = nbp;
@@ -322,7 +321,8 @@
}
brelse(bp, 0);
if (bpp != NULL) {
- error = bread(&vp, lbn, (int)fs->fs_bsize, NULL, 0, &nbp);
+ error = bread(ip->i_devvp, lbn, (int)fs->fs_bsize, NULL, 0,
+ &nbp);
if (error) {
brelse(nbp, 0);
return error;
@@ -346,7 +346,6 @@
int64_t *allocblk, allociblk[UFS_NIADDR + 1];
int64_t *allocib;
const int needswap = UFS_FSNEEDSWAP(fs);
- struct vnode vp = { ip->i_fd, ip->i_fs, NULL };
lbn = lblkno(fs, offset);
size = blkoff(fs, offset) + bufsize;
@@ -390,8 +389,8 @@
*/
if (bpp != NULL) {
- error = bread(&vp, lbn, fs->fs_bsize, NULL, 0,
- bpp);
+ error = bread(ip->i_devvp, lbn, fs->fs_bsize,
+ NULL, 0, bpp);
if (error) {
brelse(*bpp, 0);
return (error);
Home |
Main Index |
Thread Index |
Old Index