diff options
| author | bp <bp@FreeBSD.org> | 2000-11-18 02:47:12 +0000 |
|---|---|---|
| committer | bp <bp@FreeBSD.org> | 2000-11-18 02:47:12 +0000 |
| commit | d1e0950f7e70c0eb7a93ac58503f1e89ff6a51f5 (patch) | |
| tree | bc746ecabaf382dae4dd1f3f2cb02be7943e9df9 | |
| parent | abf0152035ca85562c4ad45c23616f1746d94d1f (diff) | |
| download | FreeBSD-src-d1e0950f7e70c0eb7a93ac58503f1e89ff6a51f5.zip FreeBSD-src-d1e0950f7e70c0eb7a93ac58503f1e89ff6a51f5.tar.gz | |
Use vop_defaultop() instead of ntfs_bypass().
PR: kern/22756
| -rw-r--r-- | sys/fs/ntfs/ntfs_vnops.c | 8 | ||||
| -rw-r--r-- | sys/ntfs/ntfs_vnops.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index e100730..710c0d1 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/sys/fs/ntfs/ntfs_vnops.c @@ -79,7 +79,6 @@ #include <sys/unistd.h> /* for pathconf(2) constants */ -static int ntfs_bypass __P((struct vop_generic_args *ap)); static int ntfs_read __P((struct vop_read_args *)); static int ntfs_write __P((struct vop_write_args *ap)); static int ntfs_getattr __P((struct vop_getattr_args *ap)); @@ -97,6 +96,8 @@ static int ntfs_bmap __P((struct vop_bmap_args *ap)); static int ntfs_getpages __P((struct vop_getpages_args *ap)); static int ntfs_putpages __P((struct vop_putpages_args *)); static int ntfs_fsync __P((struct vop_fsync_args *ap)); +#else +static int ntfs_bypass __P((struct vop_generic_args *ap)); #endif static int ntfs_pathconf __P((void *)); @@ -190,6 +191,8 @@ ntfs_read(ap) return (0); } +#if !defined(__FreeBSD__) + static int ntfs_bypass(ap) struct vop_generic_args /* { @@ -202,6 +205,7 @@ ntfs_bypass(ap) return (error); } +#endif static int ntfs_getattr(ap) @@ -847,7 +851,7 @@ vop_t **ntfs_vnodeop_p; #if defined(__FreeBSD__) static struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)ntfs_bypass }, + { &vop_default_desc, (vop_t *)vop_defaultop }, { &vop_getattr_desc, (vop_t *)ntfs_getattr }, { &vop_inactive_desc, (vop_t *)ntfs_inactive }, diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c index e100730..710c0d1 100644 --- a/sys/ntfs/ntfs_vnops.c +++ b/sys/ntfs/ntfs_vnops.c @@ -79,7 +79,6 @@ #include <sys/unistd.h> /* for pathconf(2) constants */ -static int ntfs_bypass __P((struct vop_generic_args *ap)); static int ntfs_read __P((struct vop_read_args *)); static int ntfs_write __P((struct vop_write_args *ap)); static int ntfs_getattr __P((struct vop_getattr_args *ap)); @@ -97,6 +96,8 @@ static int ntfs_bmap __P((struct vop_bmap_args *ap)); static int ntfs_getpages __P((struct vop_getpages_args *ap)); static int ntfs_putpages __P((struct vop_putpages_args *)); static int ntfs_fsync __P((struct vop_fsync_args *ap)); +#else +static int ntfs_bypass __P((struct vop_generic_args *ap)); #endif static int ntfs_pathconf __P((void *)); @@ -190,6 +191,8 @@ ntfs_read(ap) return (0); } +#if !defined(__FreeBSD__) + static int ntfs_bypass(ap) struct vop_generic_args /* { @@ -202,6 +205,7 @@ ntfs_bypass(ap) return (error); } +#endif static int ntfs_getattr(ap) @@ -847,7 +851,7 @@ vop_t **ntfs_vnodeop_p; #if defined(__FreeBSD__) static struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)ntfs_bypass }, + { &vop_default_desc, (vop_t *)vop_defaultop }, { &vop_getattr_desc, (vop_t *)ntfs_getattr }, { &vop_inactive_desc, (vop_t *)ntfs_inactive }, |
