Date: Fri, 12 Sep 2014 15:49:21 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271467 - head/sys/fs/ext2fs Message-ID: <201409121549.s8CFnMwc007743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Fri Sep 12 15:49:21 2014 New Revision: 271467 URL: http://svnweb.freebsd.org/changeset/base/271467 Log: ext2fs: add ext2_getpages(). Literally copy/pasted from ffs_getpages(). Tested with: fsx MFC after: 2 months Modified: head/sys/fs/ext2fs/ext2_vnops.c Modified: head/sys/fs/ext2fs/ext2_vnops.c ============================================================================== --- head/sys/fs/ext2fs/ext2_vnops.c Fri Sep 12 14:17:09 2014 (r271466) +++ head/sys/fs/ext2fs/ext2_vnops.c Fri Sep 12 15:49:21 2014 (r271467) @@ -54,6 +54,7 @@ #include <sys/buf.h> #include <sys/endian.h> #include <sys/priv.h> +#include <sys/rwlock.h> #include <sys/mount.h> #include <sys/unistd.h> #include <sys/time.h> @@ -65,9 +66,11 @@ #include <sys/file.h> #include <vm/vm.h> -#include <vm/vm_page.h> -#include <vm/vm_object.h> +#include <vm/vm_param.h> #include <vm/vm_extern.h> +#include <vm/vm_object.h> +#include <vm/vm_page.h> +#include <vm/vm_pager.h> #include <vm/vnode_pager.h> #include "opt_directio.h" @@ -94,6 +97,7 @@ static int ext2_chown(struct vnode *, ui static vop_close_t ext2_close; static vop_create_t ext2_create; static vop_fsync_t ext2_fsync; +static vop_getpages_t ext2_getpages; static vop_getattr_t ext2_getattr; static vop_ioctl_t ext2_ioctl; static vop_link_t ext2_link; @@ -124,6 +128,7 @@ struct vop_vector ext2_vnodeops = { .vop_close = ext2_close, .vop_create = ext2_create, .vop_fsync = ext2_fsync, + .vop_getpages = ext2_getpages, .vop_getattr = ext2_getattr, .vop_inactive = ext2_inactive, .vop_ioctl = ext2_ioctl, @@ -2058,3 +2063,43 @@ ext2_write(struct vop_write_args *ap) } return (error); } + +/* + * get page routine + */ +static int +ext2_getpages( struct vop_getpages_args *ap) +{ + int i; + vm_page_t mreq; + int pcount; + + pcount = round_page(ap->a_count) / PAGE_SIZE; + mreq = ap->a_m[ap->a_reqpage]; + + /* + * if ANY DEV_BSIZE blocks are valid on a large filesystem block, + * then the entire page is valid. Since the page may be mapped, + * user programs might reference data beyond the actual end of file + * occuring within the page. We have to zero that data. + */ + VM_OBJECT_WLOCK(mreq->object); + if (mreq->valid) { + if (mreq->valid != VM_PAGE_BITS_ALL) + vm_page_zero_invalid(mreq, TRUE); + for (i = 0; i < pcount; i++) { + if (i != ap->a_reqpage) { + vm_page_lock(ap->a_m[i]); + vm_page_free(ap->a_m[i]); + vm_page_unlock(ap->a_m[i]); + } + } + VM_OBJECT_WUNLOCK(mreq->object); + return VM_PAGER_OK; + } + VM_OBJECT_WUNLOCK(mreq->object); + + return vnode_pager_generic_getpages(ap->a_vp, ap->a_m, + ap->a_count, + ap->a_reqpage); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409121549.s8CFnMwc007743>