Diff for /src/sys/kern/vfs_cluster.c between versions 1.9 and 1.10

version 1.9, 2004/05/10 10:51:32 version 1.10, 2004/06/01 22:19:30
Line 86  extern int cluster_pbuf_freecnt; Line 86  extern int cluster_pbuf_freecnt;
  * This replaces bread.   * This replaces bread.
  */   */
 int  int
cluster_read(vp, filesize, lblkno, size, totread, seqcount, bpp)cluster_read(struct vnode *vp, u_quad_t filesize, daddr_t lblkno, 
        struct vnode *vp;        long size, long totread, int seqcount, struct buf **bpp)
        u_quad_t filesize; 
        daddr_t lblkno; 
        long size; 
        long totread; 
        int seqcount; 
        struct buf **bpp; 
 {  {
         struct buf *bp, *rbp, *reqbp;          struct buf *bp, *rbp, *reqbp;
         daddr_t blkno, origblkno;          daddr_t blkno, origblkno;
Line 302  single_block_read: Line 296  single_block_read:
  * and then parcel them up into logical blocks in the buffer hash table.   * and then parcel them up into logical blocks in the buffer hash table.
  */   */
 static struct buf *  static struct buf *
cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp)cluster_rbuild(struct vnode *vp, u_quad_t filesize, daddr_t lbn, 
        struct vnode *vp;        daddr_t blkno, long size, int run, struct buf *fbp)
        u_quad_t filesize; 
        daddr_t lbn; 
        daddr_t blkno; 
        long size; 
        int run; 
        struct buf *fbp; 
 {  {
         struct buf *bp, *tbp;          struct buf *bp, *tbp;
         daddr_t bn;          daddr_t bn;
Line 510  cluster_rbuild(vp, filesize, lbn, blkno, Line 498  cluster_rbuild(vp, filesize, lbn, blkno,
  * that we will need to shift around.   * that we will need to shift around.
  */   */
 void  void
cluster_callback(bp)cluster_callback(struct buf *bp)
        struct buf *bp; 
 {  {
         struct buf *nbp, *tbp;          struct buf *nbp, *tbp;
         int error = 0;          int error = 0;
Line 593  cluster_wbuild_wb(struct vnode *vp, long Line 580  cluster_wbuild_wb(struct vnode *vp, long
  *      4.      end of a cluster - asynchronously write cluster   *      4.      end of a cluster - asynchronously write cluster
  */   */
 void  void
cluster_write(bp, filesize, seqcount)cluster_write(struct buf *bp, u_quad_t filesize, int seqcount)
        struct buf *bp; 
        u_quad_t filesize; 
        int seqcount; 
 {  {
         struct vnode *vp;          struct vnode *vp;
         daddr_t lbn;          daddr_t lbn;
Line 744  cluster_write(bp, filesize, seqcount) Line 728  cluster_write(bp, filesize, seqcount)
  * the current block (if last_bp == NULL).   * the current block (if last_bp == NULL).
  */   */
 int  int
cluster_wbuild(vp, size, start_lbn, len)cluster_wbuild(struct vnode *vp, long size, daddr_t start_lbn, int len)
        struct vnode *vp; 
        long size; 
        daddr_t start_lbn; 
        int len; 
 {  {
         struct buf *bp, *tbp;          struct buf *bp, *tbp;
         int i, j, s;          int i, j, s;
Line 948  cluster_wbuild(vp, size, start_lbn, len) Line 928  cluster_wbuild(vp, size, start_lbn, len)
  * Plus add one additional buffer.   * Plus add one additional buffer.
  */   */
 static struct cluster_save *  static struct cluster_save *
cluster_collectbufs(vp, last_bp)cluster_collectbufs(struct vnode *vp, struct buf *last_bp)
        struct vnode *vp; 
        struct buf *last_bp; 
 {  {
         struct cluster_save *buflist;          struct cluster_save *buflist;
         struct buf *bp;          struct buf *bp;

Removed from v.1.9  
changed lines
  Added in v.1.10