diff options
| author | avg <avg@FreeBSD.org> | 2013-11-29 15:33:40 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2013-11-29 15:33:40 +0000 |
| commit | 7a0711c3380ae85e73f9bd991ac55c882c4dae85 (patch) | |
| tree | 965bc248497743a180ef316b5b22ef3dc6c1dbf2 /sys/cddl | |
| parent | 63dbff5d060dfc0d6d82bbd3d0be1e39515c8b57 (diff) | |
| download | FreeBSD-src-7a0711c3380ae85e73f9bd991ac55c882c4dae85.zip FreeBSD-src-7a0711c3380ae85e73f9bd991ac55c882c4dae85.tar.gz | |
zfs: make zfs_map_page / zfs_unmap_page public
MFC after: 15 days
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/vm.h | 15 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 16 |
2 files changed, 15 insertions, 16 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/vm.h b/sys/cddl/compat/opensolaris/sys/vm.h index 40e4ffa..506a5f5 100644 --- a/sys/cddl/compat/opensolaris/sys/vm.h +++ b/sys/cddl/compat/opensolaris/sys/vm.h @@ -31,6 +31,8 @@ #ifdef _KERNEL +#include <sys/sf_buf.h> + extern const int zfs_vm_pagerret_bad; extern const int zfs_vm_pagerret_error; extern const int zfs_vm_pagerret_ok; @@ -39,6 +41,19 @@ void zfs_vmobject_assert_wlocked(vm_object_t object); void zfs_vmobject_wlock(vm_object_t object); void zfs_vmobject_wunlock(vm_object_t object); +static inline caddr_t +zfs_map_page(vm_page_t pp, struct sf_buf **sfp) +{ + *sfp = sf_buf_alloc(pp, 0); + return ((caddr_t)sf_buf_kva(*sfp)); +} + +static inline void +zfs_unmap_page(struct sf_buf *sf) +{ + sf_buf_free(sf); +} + #endif /* _KERNEL */ #endif /* _OPENSOLARIS_SYS_VM_H_ */ diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 1359c66..46fd4c2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -71,7 +71,6 @@ #include <sys/kidmap.h> #include <sys/bio.h> #include <sys/buf.h> -#include <sys/sf_buf.h> #include <sys/sched.h> #include <sys/acl.h> #include <vm/vm_param.h> @@ -452,21 +451,6 @@ page_unhold(vm_page_t pp) vm_page_unlock(pp); } -static caddr_t -zfs_map_page(vm_page_t pp, struct sf_buf **sfp) -{ - - *sfp = sf_buf_alloc(pp, 0); - return ((caddr_t)sf_buf_kva(*sfp)); -} - -static void -zfs_unmap_page(struct sf_buf *sf) -{ - - sf_buf_free(sf); -} - /* * When a file is memory mapped, we must keep the IO data synchronized * between the DMU cache and the memory mapped pages. What this means: |
