Retire b_magic now, we have the bufobj containing the same hint.
This commit is contained in:
parent
b5a00bdb60
commit
6e67e2a710
@ -1932,7 +1932,6 @@ restart:
|
|||||||
bp->b_bcount = 0;
|
bp->b_bcount = 0;
|
||||||
bp->b_npages = 0;
|
bp->b_npages = 0;
|
||||||
bp->b_dirtyoff = bp->b_dirtyend = 0;
|
bp->b_dirtyoff = bp->b_dirtyend = 0;
|
||||||
bp->b_magic = B_MAGIC_BIO;
|
|
||||||
bp->b_bufobj = NULL;
|
bp->b_bufobj = NULL;
|
||||||
|
|
||||||
LIST_INIT(&bp->b_dep);
|
LIST_INIT(&bp->b_dep);
|
||||||
|
@ -821,7 +821,6 @@ cluster_wbuild(vp, size, start_lbn, len)
|
|||||||
*/
|
*/
|
||||||
TAILQ_INIT(&bp->b_cluster.cluster_head);
|
TAILQ_INIT(&bp->b_cluster.cluster_head);
|
||||||
bp->b_bcount = 0;
|
bp->b_bcount = 0;
|
||||||
bp->b_magic = tbp->b_magic;
|
|
||||||
bp->b_bufobj = tbp->b_bufobj;
|
bp->b_bufobj = tbp->b_bufobj;
|
||||||
bp->b_bufsize = 0;
|
bp->b_bufsize = 0;
|
||||||
bp->b_npages = 0;
|
bp->b_npages = 0;
|
||||||
|
@ -836,7 +836,6 @@ again:
|
|||||||
bcount += n;
|
bcount += n;
|
||||||
allocbuf(bp, bcount);
|
allocbuf(bp, bcount);
|
||||||
bp->b_flags |= save;
|
bp->b_flags |= save;
|
||||||
bp->b_magic = B_MAGIC_NFS;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
|
@ -103,9 +103,6 @@ struct buf {
|
|||||||
uint8_t b_ioflags;
|
uint8_t b_ioflags;
|
||||||
off_t b_iooffset;
|
off_t b_iooffset;
|
||||||
long b_resid;
|
long b_resid;
|
||||||
unsigned b_magic;
|
|
||||||
#define B_MAGIC_BIO 0x10b10b10
|
|
||||||
#define B_MAGIC_NFS 0x67238234
|
|
||||||
void (*b_iodone)(struct buf *);
|
void (*b_iodone)(struct buf *);
|
||||||
daddr_t b_blkno; /* Underlying physical block number. */
|
daddr_t b_blkno; /* Underlying physical block number. */
|
||||||
off_t b_offset; /* Offset into file. */
|
off_t b_offset; /* Offset into file. */
|
||||||
|
@ -295,7 +295,6 @@ initpbuf(struct buf *bp)
|
|||||||
bp->b_ioflags = 0;
|
bp->b_ioflags = 0;
|
||||||
bp->b_iodone = NULL;
|
bp->b_iodone = NULL;
|
||||||
bp->b_error = 0;
|
bp->b_error = 0;
|
||||||
bp->b_magic = B_MAGIC_BIO;
|
|
||||||
BUF_LOCK(bp, LK_EXCLUSIVE, NULL);
|
BUF_LOCK(bp, LK_EXCLUSIVE, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user