diff options
| author | julian <julian@FreeBSD.org> | 1998-05-19 20:50:41 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 1998-05-19 20:50:41 +0000 |
| commit | 99669d2e372803ba9b5cd55be7ae965f3dde697c (patch) | |
| tree | a97d6ee5cc3860a309817be93606b2c036df867a /sys/contrib | |
| parent | bee67649e2dfdecc00ee300a3148fa3955a6c40c (diff) | |
| download | FreeBSD-src-99669d2e372803ba9b5cd55be7ae965f3dde697c.zip FreeBSD-src-99669d2e372803ba9b5cd55be7ae965f3dde697c.tar.gz | |
Change to stop a silly panic. This should be understood better.
Change a buffer swizzle trick to a bcopy. It would be nice if the efficient
trick could be used in the future.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/softupdates/ffs_softdep.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/contrib/softupdates/ffs_softdep.c b/sys/contrib/softupdates/ffs_softdep.c index ebda489..118689c 100644 --- a/sys/contrib/softupdates/ffs_softdep.c +++ b/sys/contrib/softupdates/ffs_softdep.c @@ -1,3 +1,4 @@ + /* * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved. * @@ -52,7 +53,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)ffs_softdep.c 9.14 (McKusick) 1/15/98 + * @(#)ffs_softdep.c 9.14 (McKusick) 1/15/98 */ /* @@ -1599,12 +1600,8 @@ deallocate_dependencies(bp, inodedep) if (bp->b_lblkno >= 0 || bp->b_blkno != indirdep->ir_savebp->b_lblkno) panic("deallocate_dependencies: not indir"); - tmp = indirdep->ir_savebp->b_data; - indirdep->ir_savebp->b_data = bp->b_data; - bp->b_data = tmp; - tmpsize = indirdep->ir_savebp->b_bufsize; - indirdep->ir_savebp->b_bufsize = bp->b_bufsize; - bp->b_bufsize = tmpsize; + bcopy(bp->b_data, indirdep->ir_savebp->b_data, + bp->b_bcount); WORKLIST_REMOVE(wk); WORKLIST_INSERT(&indirdep->ir_savebp->b_dep, wk); continue; |
