src/sys/vfs/hpfs/hpfs_vnops.c - diff

Return to hpfs_vnops.c CVS log

Up to [DragonFly] / src / sys / vfs / hpfs

Diff for /src/sys/vfs/hpfs/hpfs_vnops.c between versions 1.11 and 1.12

version 1.11, 2003/10/09 22:27:23	version 1.12, 2004/02/05 21:03:37
Line 43	Line 43

#include <vm/vm.h>	#include <vm/vm.h>
#include <vm/vm_param.h>	#include <vm/vm_param.h>
#if !defined(__FreeBSD__)	#if !defined(__DragonFly__)
#include <vm/vm_prot.h>	#include <vm/vm_prot.h>
#endif	#endif
#include <vm/vm_page.h>	#include <vm/vm_page.h>
#include <vm/vm_object.h>	#include <vm/vm_object.h>
#include <vm/vm_pager.h>	#include <vm/vm_pager.h>
#include <vm/vm_zone.h>	#include <vm/vm_zone.h>
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
#include <vm/vnode_pager.h>	#include <vm/vnode_pager.h>
#endif	#endif
#include <vm/vm_extern.h>	#include <vm/vm_extern.h>
#include <sys/buf2.h>	#include <sys/buf2.h>

#if !defined(__FreeBSD__)	#if !defined(__DragonFly__)
#include <miscfs/specfs/specdev.h>	#include <miscfs/specfs/specdev.h>
#include <miscfs/genfs/genfs.h>	#include <miscfs/genfs/genfs.h>
#endif	#endif
Line 87 static int hpfs_lookup (struct vop_looku	Line 87 static int hpfs_lookup (struct vop_looku
static int hpfs_create (struct vop_create_args *);	static int hpfs_create (struct vop_create_args *);
static int hpfs_remove (struct vop_remove_args *);	static int hpfs_remove (struct vop_remove_args *);
static int hpfs_bmap (struct vop_bmap_args *ap);	static int hpfs_bmap (struct vop_bmap_args *ap);
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
static int hpfs_getpages (struct vop_getpages_args *ap);	static int hpfs_getpages (struct vop_getpages_args *ap);
static int hpfs_putpages (struct vop_putpages_args *);	static int hpfs_putpages (struct vop_putpages_args *);
static int hpfs_fsync (struct vop_fsync_args *ap);	static int hpfs_fsync (struct vop_fsync_args *ap);
#endif	#endif
static int hpfs_pathconf (struct vop_pathconf_args *ap);	static int hpfs_pathconf (struct vop_pathconf_args *ap);

#if defined(__FreeBSD__)	#if defined(__DragonFly__)
int	int
hpfs_getpages(ap)	hpfs_getpages(ap)
struct vop_getpages_args *ap;	struct vop_getpages_args *ap;
Line 313 hpfs_bmap(ap)	Line 313 hpfs_bmap(ap)

if (ap->a_vpp != NULL)	if (ap->a_vpp != NULL)
*ap->a_vpp = hp->h_devvp;	*ap->a_vpp = hp->h_devvp;
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
if (ap->a_runb != NULL)	if (ap->a_runb != NULL)
*ap->a_runb = 0;	*ap->a_runb = 0;
#endif	#endif
Line 479 hpfs_getattr(ap)	Line 479 hpfs_getattr(ap)

dprintf(("hpfs_getattr(0x%x):\n", hp->h_no));	dprintf(("hpfs_getattr(0x%x):\n", hp->h_no));

#if defined(__FreeBSD__)	#if defined(__DragonFly__)
vap->va_fsid = dev2udev(hp->h_dev);	vap->va_fsid = dev2udev(hp->h_dev);
#else /* defined(__NetBSD__) */	#else /* defined(__NetBSD__) */
vap->va_fsid = ip->i_dev;	vap->va_fsid = ip->i_dev;
Line 593 hpfs_setattr(ap)	Line 593 hpfs_setattr(ap)
}	}

if (vap->va_size < hp->h_fn.fn_size) {	if (vap->va_size < hp->h_fn.fn_size) {
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
error = vtruncbuf(vp, td, vap->va_size, DEV_BSIZE);	error = vtruncbuf(vp, td, vap->va_size, DEV_BSIZE);
if (error)	if (error)
return (error);	return (error);
Line 605 hpfs_setattr(ap)	Line 605 hpfs_setattr(ap)
return (error);	return (error);

} else if (vap->va_size > hp->h_fn.fn_size) {	} else if (vap->va_size > hp->h_fn.fn_size) {
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
vnode_pager_setsize(vp, vap->va_size);	vnode_pager_setsize(vp, vap->va_size);
#endif	#endif
error = hpfs_extend(hp, vap->va_size);	error = hpfs_extend(hp, vap->va_size);
Line 651 hpfs_inactive(ap)	Line 651 hpfs_inactive(ap)

if (hp->h_flag & H_INVAL) {	if (hp->h_flag & H_INVAL) {
VOP__UNLOCK(vp,0,ap->a_td);	VOP__UNLOCK(vp,0,ap->a_td);
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
vrecycle(vp, NULL, ap->a_td);	vrecycle(vp, NULL, ap->a_td);
#else /* defined(__NetBSD__) */	#else /* defined(__NetBSD__) */
vgone(vp);	vgone(vp);
Line 1107 readdone:	Line 1107 readdone:
if (!error && ap->a_ncookies != NULL) {	if (!error && ap->a_ncookies != NULL) {
struct dirent* dpStart;	struct dirent* dpStart;
struct dirent* dp;	struct dirent* dp;
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
u_long *cookies;	u_long *cookies;
u_long *cookiep;	u_long *cookiep;
#else /* defined(__NetBSD__) */	#else /* defined(__NetBSD__) */
Line 1121 readdone:	Line 1121 readdone:
dpStart = (struct dirent *)	dpStart = (struct dirent *)
((caddr_t)uio->uio_iov->iov_base -	((caddr_t)uio->uio_iov->iov_base -
(uio->uio_offset - off));	(uio->uio_offset - off));
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
MALLOC(cookies, u_long , ncookies sizeof(u_long),	MALLOC(cookies, u_long , ncookies sizeof(u_long),
M_TEMP, M_WAITOK);	M_TEMP, M_WAITOK);
#else /* defined(__NetBSD__) */	#else /* defined(__NetBSD__) */
Line 1356 hpfs_pathconf(ap)	Line 1356 hpfs_pathconf(ap)
* Global vfs data structures	* Global vfs data structures
*/	*/
vop_t **hpfs_vnodeop_p;	vop_t **hpfs_vnodeop_p;
#if defined(__FreeBSD__)	#if defined(__DragonFly__)
struct vnodeopv_entry_desc hpfs_vnodeop_entries[] = {	struct vnodeopv_entry_desc hpfs_vnodeop_entries[] = {
{ &vop_default_desc, (vop_t *)vop_defaultop },	{ &vop_default_desc, (vop_t *)vop_defaultop },

Removed from v.1.11
changed lines
	Added in v.1.12