svn commit: r198840 - in user/kmacy/releng_8_fcs_buf/sys: kern sys

[Kip Macy]

Author: kmacy
Date: Tue Nov  3 05:52:44 2009
New Revision: 198840
URL: http://svn.freebsd.org/changeset/base/198840

Log:
  make _allocbuf visible as allocbuf_flags

Modified:
  user/kmacy/releng_8_fcs_buf/sys/kern/vfs_bio.c
  user/kmacy/releng_8_fcs_buf/sys/sys/buf.h

Modified: user/kmacy/releng_8_fcs_buf/sys/kern/vfs_bio.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf/sys/kern/vfs_bio.c	Tue Nov  3 03:29:57 2009	(r198839)
+++ user/kmacy/releng_8_fcs_buf/sys/kern/vfs_bio.c	Tue Nov  3 05:52:44 2009	(r198840)
@@ -94,7 +94,6 @@ struct buf *buf;		/* buffer header pool 
 
 static struct proc *bufdaemonproc;
 
-static int _allocbuf(struct buf *bp, int size, int flags);
 static int inmem(struct vnode *vp, daddr_t blkno);
 static void vm_hold_free_pages(struct buf *bp, vm_offset_t from,
 		vm_offset_t to);
@@ -2625,7 +2624,7 @@ loop:
 		 */
 
 		if (bp->b_bcount != size)
-			_allocbuf(bp, size, flags);
+			allocbuf_flags(bp, size, flags);
 
 		KASSERT(bp->b_offset != NOOFFSET, 
 		    ("getblk: no buffer offset"));
@@ -2745,7 +2744,7 @@ loop:
 			    bp, bp->b_bufobj->bo_object));
 		}
 
-		_allocbuf(bp, size, flags);
+		allocbuf_flags(bp, size, flags);
 		bp->b_flags &= ~B_DONE;
 	}
 	CTR4(KTR_BUF, "getblk(%p, %ld, %d) = %p", vp, (long)blkno, size, bp);
@@ -2771,7 +2770,7 @@ geteblk(int size, int flags)
 		    (curthread->td_pflags & TDP_BUFNEED) != 0)
 			return (NULL);
 	}
-	_allocbuf(bp, size, flags);
+	allocbuf_flags(bp, size, flags);
 	bp->b_flags |= B_INVAL;	/* b_dep cleared by getnewbuf() */
 	BUF_ASSERT_HELD(bp);
 	return (bp);
@@ -2793,8 +2792,8 @@ geteblk(int size, int flags)
  * B_CACHE for the non-VMIO case.
  */
 
-static int
-_allocbuf(struct buf *bp, int size, int flags)
+int
+allocbuf_flags(struct buf *bp, int size, int flags)
 {
 	int newbsize, mbsize;
 	int i;
@@ -3089,7 +3088,7 @@ int
 allocbuf(struct buf *bp, int size)
 {
 
-	return (_allocbuf(bp, size, 0));
+	return (allocbuf_flags(bp, size, 0));
 }
 
 void

Modified: user/kmacy/releng_8_fcs_buf/sys/sys/buf.h
==============================================================================
--- user/kmacy/releng_8_fcs_buf/sys/sys/buf.h	Tue Nov  3 03:29:57 2009	(r198839)
+++ user/kmacy/releng_8_fcs_buf/sys/sys/buf.h	Tue Nov  3 05:52:44 2009	(r198840)
@@ -513,6 +513,7 @@ void	pbgetvp(struct vnode *, struct buf 
 void	pbrelbo(struct buf *);
 void	pbrelvp(struct buf *);
 int	allocbuf(struct buf *bp, int size);
+int	allocbuf_flags(struct buf *bp, int size, int flags);
 void	reassignbuf(struct buf *);
 struct	buf *trypbuf(int *);
 void	bwait(struct buf *, u_char, const char *);