summaryrefslogtreecommitdiffstats
path: root/module/zfs/zfs_vnops.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2011-07-01 09:16:15 -0700
committerBrian Behlendorf <[email protected]>2011-07-01 12:22:57 -0700
commitf0b2486034f6a4d8cd1a139ff4604e6b9629a64e (patch)
treebd16799c5434fdfc20ea893d277de54430f950b3 /module/zfs/zfs_vnops.c
parentdde471ef5a07bd569deeadd3e9a88655db3e10ab (diff)
Remove unused MMAP functions
The following functions were required for the OpenSolaris mmap implementation. Because the Linux VFS does most the most heavy lifting for us they are not required and are being removed to keep the code clean and easy to understand. * zfs_null_putapage() * zfs_frlock() * zfs_no_putpage() Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/zfs_vnops.c')
-rw-r--r--module/zfs/zfs_vnops.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index ff761854c..53d319478 100644
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -3712,21 +3712,6 @@ top:
}
EXPORT_SYMBOL(zfs_link);
-#ifdef HAVE_MMAP
-/*
- * zfs_null_putapage() is used when the file system has been force
- * unmounted. It just drops the pages.
- */
-/* ARGSUSED */
-static int
-zfs_null_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
- size_t *lenp, int flags, cred_t *cr)
-{
- pvn_write_done(pp, B_INVAL|B_FORCE|B_ERROR);
- return (0);
-}
-#endif /* HAVE_MMAP */
-
/*
* Push a page out to disk
*
@@ -3925,36 +3910,6 @@ zfs_seek(struct inode *ip, offset_t ooff, offset_t *noffp)
}
EXPORT_SYMBOL(zfs_seek);
-#ifdef HAVE_MMAP
-/*
- * Pre-filter the generic locking function to trap attempts to place
- * a mandatory lock on a memory mapped file.
- */
-static int
-zfs_frlock(vnode_t *vp, int cmd, flock64_t *bfp, int flag, offset_t offset,
- flk_callback_t *flk_cbp, cred_t *cr)
-{
- znode_t *zp = VTOZ(vp);
- zfsvfs_t *zfsvfs = zp->z_zfsvfs;
-
- ZFS_ENTER(zfsvfs);
- ZFS_VERIFY_ZP(zp);
-
- /*
- * We are following the UFS semantics with respect to mapcnt
- * here: If we see that the file is mapped already, then we will
- * return an error, but we don't worry about races between this
- * function and zfs_map().
- */
- if (zp->z_mapcnt > 0 && MANDMODE(zp->z_mode)) {
- ZFS_EXIT(zfsvfs);
- return (EAGAIN);
- }
- ZFS_EXIT(zfsvfs);
- return (fs_frlock(vp, cmd, bfp, flag, offset, flk_cbp, cr, ct));
-}
-#endif /* HAVE_MMAP */
-
/*
* Fill pages with data from the disk.
*/