summaryrefslogtreecommitdiffstats
path: root/sys/fs/smbfs/smbfs_io.c
diff options
context:
space:
mode:
authorbp <bp@FreeBSD.org>2002-04-23 13:55:14 +0000
committerbp <bp@FreeBSD.org>2002-04-23 13:55:14 +0000
commit9bf05680fa7ba7a2d890ed7dbcaaa49769176f82 (patch)
tree79b77c0dfd7c1339e79fdd56be74d1f3f87abc62 /sys/fs/smbfs/smbfs_io.c
parentfcc023e0db9f73c6d948359d8baba37e4b5a5f8b (diff)
downloadFreeBSD-src-9bf05680fa7ba7a2d890ed7dbcaaa49769176f82.zip
FreeBSD-src-9bf05680fa7ba7a2d890ed7dbcaaa49769176f82.tar.gz
Get rid from extra #ifdefs.
Diffstat (limited to 'sys/fs/smbfs/smbfs_io.c')
-rw-r--r--sys/fs/smbfs/smbfs_io.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 62290be..57ffd38 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -49,9 +49,6 @@
#include <sys/vmmeter.h>
#include <vm/vm.h>
-#if __FreeBSD_version < 400000
-#include <vm/vm_prot.h>
-#endif
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
#include <vm/vm_object.h>
@@ -441,11 +438,8 @@ smbfs_getpages(ap)
}
smb_makescred(&scred, td, cred);
-#if __FreeBSD_version >= 400000
bp = getpbuf(&smbfs_pbuf_freecnt);
-#else
- bp = getpbuf();
-#endif
+
npages = btoc(count);
kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, pages, npages);
@@ -465,11 +459,7 @@ smbfs_getpages(ap)
error = smb_read(smp->sm_share, np->n_fid, &uio, &scred);
pmap_qremove(kva, npages);
-#if __FreeBSD_version >= 400000
relpbuf(bp, &smbfs_pbuf_freecnt);
-#else
- relpbuf(bp);
-#endif
if (error && (uio.uio_resid == count)) {
printf("smbfs_getpages: error %d\n",error);
@@ -580,11 +570,8 @@ smbfs_putpages(ap)
rtvals[i] = VM_PAGER_AGAIN;
}
-#if __FreeBSD_version >= 400000
bp = getpbuf(&smbfs_pbuf_freecnt);
-#else
- bp = getpbuf();
-#endif
+
kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, pages, npages);
cnt.v_vnodeout++;
@@ -607,11 +594,8 @@ smbfs_putpages(ap)
SMBVDEBUG("paged write done: %d\n", error);
pmap_qremove(kva, npages);
-#if __FreeBSD_version >= 400000
+
relpbuf(bp, &smbfs_pbuf_freecnt);
-#else
- relpbuf(bp);
-#endif
if (!error) {
int nwritten = round_page(count - uio.uio_resid) / PAGE_SIZE;
OpenPOWER on IntegriCloud