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

use b_private rather than b_saveaddr. 

XXX LFS_USE_B_INVAL
This commit is contained in:
yamt 2003-12-04 14:57:47 +00:00
parent 228f85d62e
commit 3ea6756a92
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/ufs/lfs/lfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_bio.c,v 1.75 2003/10/03 15:35:54 yamt Exp $ */ /* $NetBSD: lfs_bio.c,v 1.76 2003/12/04 14:57:47 yamt Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.75 2003/10/03 15:35:54 yamt Exp $"); __KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.76 2003/12/04 14:57:47 yamt Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -684,7 +684,6 @@ lfs_newbuf(struct lfs *fs, struct vnode *vp, daddr_t daddr, size_t size, int typ
bgetvp(vp, bp); bgetvp(vp, bp);
splx(s); splx(s);
bp->b_saveaddr = (caddr_t)fs;
bp->b_bufsize = size; bp->b_bufsize = size;
bp->b_bcount = size; bp->b_bcount = size;
bp->b_lblkno = daddr; bp->b_lblkno = daddr;
@ -693,6 +692,7 @@ lfs_newbuf(struct lfs *fs, struct vnode *vp, daddr_t daddr, size_t size, int typ
bp->b_resid = 0; bp->b_resid = 0;
bp->b_iodone = lfs_callback; bp->b_iodone = lfs_callback;
bp->b_flags |= B_BUSY | B_CALL | B_NOCACHE; bp->b_flags |= B_BUSY | B_CALL | B_NOCACHE;
bp->b_private = fs;
return (bp); return (bp);
} }

16
sys/ufs/lfs/lfs_segment.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_segment.c,v 1.143 2003/11/07 17:55:29 yamt Exp $ */ /* $NetBSD: lfs_segment.c,v 1.144 2003/12/04 14:57:47 yamt Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.143 2003/11/07 17:55:29 yamt Exp $"); __KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.144 2003/12/04 14:57:47 yamt Exp $");
#define ivndebug(vp,str) printf("ino %d: %s\n",VTOI(vp)->i_number,(str)) #define ivndebug(vp,str) printf("ino %d: %s\n",VTOI(vp)->i_number,(str))
@ -1623,7 +1623,7 @@ lfs_newclusterbuf(struct lfs *fs, struct vnode *vp, daddr_t addr, int n)
bp->b_dev = NODEV; bp->b_dev = NODEV;
bp->b_blkno = bp->b_lblkno = addr; bp->b_blkno = bp->b_lblkno = addr;
bp->b_iodone = lfs_cluster_callback; bp->b_iodone = lfs_cluster_callback;
bp->b_saveaddr = (caddr_t)cl; bp->b_private = cl;
bp->b_vp = vp; bp->b_vp = vp;
return bp; return bp;
@ -1912,7 +1912,7 @@ lfs_writeseg(struct lfs *fs, struct segment *sp)
panic("devvp is NULL"); panic("devvp is NULL");
for (bpp = sp->bpp, i = nblocks; i;) { for (bpp = sp->bpp, i = nblocks; i;) {
cbp = lfs_newclusterbuf(fs, devvp, (*bpp)->b_blkno, i); cbp = lfs_newclusterbuf(fs, devvp, (*bpp)->b_blkno, i);
cl = (struct lfs_cluster *)cbp->b_saveaddr; cl = cbp->b_private;
cbp->b_dev = i_dev; cbp->b_dev = i_dev;
cbp->b_flags |= B_ASYNC | B_BUSY; cbp->b_flags |= B_ASYNC | B_BUSY;
@ -2061,8 +2061,6 @@ lfs_writesuper(struct lfs *fs, daddr_t daddr)
bp->b_flags |= B_BUSY | B_CALL | B_ASYNC; bp->b_flags |= B_BUSY | B_CALL | B_ASYNC;
bp->b_flags &= ~(B_DONE | B_ERROR | B_READ | B_DELWRI); bp->b_flags &= ~(B_DONE | B_ERROR | B_READ | B_DELWRI);
bp->b_iodone = lfs_supercallback; bp->b_iodone = lfs_supercallback;
/* XXX KS - same nasty hack as above */
bp->b_saveaddr = (caddr_t)fs;
vop_strategy_a.a_desc = VDESC(vop_strategy); vop_strategy_a.a_desc = VDESC(vop_strategy);
vop_strategy_a.a_bp = bp; vop_strategy_a.a_bp = bp;
@ -2140,7 +2138,7 @@ lfs_callback(struct buf *bp)
{ {
struct lfs *fs; struct lfs *fs;
fs = (struct lfs *)bp->b_saveaddr; fs = bp->b_private;
lfs_freebuf(fs, bp); lfs_freebuf(fs, bp);
} }
@ -2149,7 +2147,7 @@ lfs_super_aiodone(struct buf *bp)
{ {
struct lfs *fs; struct lfs *fs;
fs = (struct lfs *)bp->b_saveaddr; fs = bp->b_private;
fs->lfs_sbactive = 0; fs->lfs_sbactive = 0;
wakeup(&fs->lfs_sbactive); wakeup(&fs->lfs_sbactive);
if (--fs->lfs_iocount <= 1) if (--fs->lfs_iocount <= 1)
@ -2170,7 +2168,7 @@ lfs_cluster_aiodone(struct buf *bp)
if (bp->b_flags & B_ERROR) if (bp->b_flags & B_ERROR)
error = bp->b_error; error = bp->b_error;
cl = (struct lfs_cluster *)bp->b_saveaddr; cl = bp->b_private;
fs = cl->fs; fs = cl->fs;
devvp = VTOI(fs->lfs_ivnode)->i_devvp; devvp = VTOI(fs->lfs_ivnode)->i_devvp;

5
sys/ufs/lfs/lfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_syscalls.c,v 1.99 2003/11/07 14:52:27 yamt Exp $ */ /* $NetBSD: lfs_syscalls.c,v 1.100 2003/12/04 14:57:47 yamt Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.99 2003/11/07 14:52:27 yamt Exp $"); __KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.100 2003/12/04 14:57:47 yamt Exp $");
#ifndef LFS #ifndef LFS
# define LFS /* for prototypes in syscallargs.h */ # define LFS /* for prototypes in syscallargs.h */
@ -1188,7 +1188,6 @@ lfs_fakebuf(struct lfs *fs, struct vnode *vp, int lbn, size_t size, caddr_t uadd
KDASSERT(bp->b_iodone == lfs_callback); KDASSERT(bp->b_iodone == lfs_callback);
#if 0 #if 0
bp->b_saveaddr = (caddr_t)fs;
++fs->lfs_iocount; ++fs->lfs_iocount;
#endif #endif
bp->b_bufsize = size; bp->b_bufsize = size;