Diff for /src/sys/kern/vfs_bio.c between versions 1.27 and 1.28

version 1.27, 2004/05/20 22:42:24 version 1.28, 2004/06/01 22:19:30
Line 757  bwrite(struct buf * bp) Line 757  bwrite(struct buf * bp)
  * Complete a background write started from bwrite.   * Complete a background write started from bwrite.
  */   */
 static void  static void
vfs_backgroundwritedone(bp)vfs_backgroundwritedone(struct buf *bp)
        struct buf *bp; 
 {  {
         struct buf *origbp;          struct buf *origbp;
   
Line 816  vfs_backgroundwritedone(bp) Line 815  vfs_backgroundwritedone(bp)
  * out synchronously.   * out synchronously.
  */   */
 void  void
bdwrite(struct buf * bp)bdwrite(struct buf *bp)
 {  {
         if (BUF_REFCNT(bp) == 0)          if (BUF_REFCNT(bp) == 0)
                 panic("bdwrite: buffer is not busy");                  panic("bdwrite: buffer is not busy");
Line 894  bdwrite(struct buf * bp) Line 893  bdwrite(struct buf * bp)
  *      The buffer must be on QUEUE_NONE.   *      The buffer must be on QUEUE_NONE.
  */   */
 void  void
bdirty(bp)bdirty(struct buf *bp)
        struct buf *bp; 
 {  {
         KASSERT(bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex));          KASSERT(bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex));
         bp->b_flags &= ~(B_READ|B_RELBUF);          bp->b_flags &= ~(B_READ|B_RELBUF);
Line 921  bdirty(bp) Line 919  bdirty(bp)
  */   */
   
 void  void
bundirty(bp)bundirty(struct buf *bp)
        struct buf *bp; 
 {  {
         KASSERT(bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex));          KASSERT(bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex));
   
Line 1372  bqrelse(struct buf * bp) Line 1369  bqrelse(struct buf * bp)
 }  }
   
 static void  static void
vfs_vmio_release(bp)vfs_vmio_release(struct buf *bp)
        struct buf *bp; 
 {  {
         int i, s;          int i, s;
         vm_page_t m;          vm_page_t m;
Line 2759  biowait(struct buf * bp) Line 2755  biowait(struct buf * bp)
  *      b_dev to NODEV.   *      b_dev to NODEV.
  */   */
 void  void
biodone(struct buf * bp)biodone(struct buf *bp)
 {  {
         int s, error;          int s, error;
   
Line 2937  biodone(struct buf * bp) Line 2933  biodone(struct buf * bp)
  * consistant.   * consistant.
  */   */
 void  void
vfs_unbusy_pages(struct buf * bp)vfs_unbusy_pages(struct buf *bp)
 {  {
         int i;          int i;
   
Line 3023  vfs_page_set_valid(struct buf *bp, vm_oo Line 3019  vfs_page_set_valid(struct buf *bp, vm_oo
  * and should be ignored.   * and should be ignored.
  */   */
 void  void
vfs_busy_pages(struct buf * bp, int clear_modify)vfs_busy_pages(struct buf *bp, int clear_modify)
 {  {
         int i, bogus;          int i, bogus;
   
Line 3110  retry: Line 3106  retry:
  * just go ahead and clean through to b_bufsize.   * just go ahead and clean through to b_bufsize.
  */   */
 static void  static void
vfs_clean_pages(struct buf * bp)vfs_clean_pages(struct buf *bp)
 {  {
         int i;          int i;
   
Line 3240  vfs_bio_clrbuf(struct buf *bp) Line 3236  vfs_bio_clrbuf(struct buf *bp)
  * not associated with a file object.   * not associated with a file object.
  */   */
 void  void
vm_hold_load_pages(struct buf * bp, vm_offset_t from, vm_offset_t to)vm_hold_load_pages(struct buf *bp, vm_offset_t from, vm_offset_t to)
 {  {
         vm_offset_t pg;          vm_offset_t pg;
         vm_page_t p;          vm_page_t p;
Line 3278  tryagain: Line 3274  tryagain:
 }  }
   
 void  void
vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to)vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to)
 {  {
         vm_offset_t pg;          vm_offset_t pg;
         vm_page_t p;          vm_page_t p;
Line 3378  retry: Line 3374  retry:
  * We also invalidate the TLB entries and restore the original b_addr.   * We also invalidate the TLB entries and restore the original b_addr.
  */   */
 void  void
vunmapbuf(bp)vunmapbuf(struct buf *bp)
        struct buf *bp; 
 {  {
         int pidx;          int pidx;
         int npages;          int npages;

Removed from v.1.27  
changed lines
  Added in v.1.28