summaryrefslogtreecommitdiff
path: root/sys/fs
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2022-03-27 17:10:55 +0000
committerchristos <christos@NetBSD.org>2022-03-27 17:10:55 +0000
commitf4c0ff7965bad000bb9ebbe09fd241b92173e566 (patch)
tree60b8cccf9404d0af11e1a5e78f7a0cd2bece5d91 /sys/fs
parentf63ef47a002c242596128ad2f4968f002426effd (diff)
dedup the eofs link/symlink methods
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/adosfs/advnops.c38
-rw-r--r--sys/fs/cd9660/cd9660_node.h4
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c36
-rw-r--r--sys/fs/filecorefs/filecore_node.h4
-rw-r--r--sys/fs/filecorefs/filecore_vnops.c36
5 files changed, 14 insertions, 104 deletions
diff --git a/sys/fs/adosfs/advnops.c b/sys/fs/adosfs/advnops.c
index 3d9ee2b0b50..1160f21417d 100644
--- a/sys/fs/adosfs/advnops.c
+++ b/sys/fs/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.57 2021/07/18 23:57:13 dholland Exp $ */
+/* $NetBSD: advnops.c,v 1.58 2022/03/27 17:10:55 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.57 2021/07/18 23:57:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.58 2022/03/27 17:10:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,8 +61,6 @@ int adosfs_getattr(void *);
int adosfs_read(void *);
int adosfs_write(void *);
int adosfs_strategy(void *);
-int adosfs_link(void *);
-int adosfs_symlink(void *);
int adosfs_bmap(void *);
int adosfs_print(void *);
int adosfs_readdir(void *);
@@ -97,11 +95,11 @@ const struct vnodeopv_entry_desc adosfs_vnodeop_entries[] = {
{ &vop_fsync_desc, genfs_nullop }, /* fsync */
{ &vop_seek_desc, genfs_seek }, /* seek */
{ &vop_remove_desc, genfs_eopnotsupp }, /* remove */
- { &vop_link_desc, adosfs_link }, /* link */
+ { &vop_link_desc, genfs_erofs_link }, /* link */
{ &vop_rename_desc, genfs_eopnotsupp }, /* rename */
{ &vop_mkdir_desc, genfs_eopnotsupp }, /* mkdir */
{ &vop_rmdir_desc, genfs_eopnotsupp }, /* rmdir */
- { &vop_symlink_desc, adosfs_symlink }, /* symlink */
+ { &vop_symlink_desc, genfs_erofs_symlink }, /* symlink */
{ &vop_readdir_desc, adosfs_readdir }, /* readdir */
{ &vop_readlink_desc, adosfs_readlink }, /* readlink */
{ &vop_abortop_desc, genfs_abortop }, /* abortop */
@@ -387,34 +385,6 @@ reterr:
return(error);
}
-int
-adosfs_link(void *v)
-{
- struct vop_link_v2_args /* {
- struct vnode *a_dvp;
- struct vnode *a_vp;
- struct componentname *a_cnp;
- } */ *ap = v;
-
- VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
- return (EROFS);
-}
-
-int
-adosfs_symlink(void *v)
-{
- struct vop_symlink_v3_args /* {
- struct vnode *a_dvp;
- struct vnode **a_vpp;
- struct componentname *a_cnp;
- struct vattr *a_vap;
- char *a_target;
- } */ *ap = v;
-
- VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
- return (EROFS);
-}
-
/*
* Wait until the vnode has finished changing state.
*/
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 3780eb43431..d6be258253e 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_node.h,v 1.17 2021/07/18 23:57:13 dholland Exp $ */
+/* $NetBSD: cd9660_node.h,v 1.18 2022/03/27 17:10:55 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -104,8 +104,6 @@ int cd9660_readdir(void *);
int cd9660_readlink(void *);
int cd9660_inactive(void *);
int cd9660_reclaim(void *);
-int cd9660_link(void *);
-int cd9660_symlink(void *);
int cd9660_bmap(void *);
int cd9660_lock(void *);
int cd9660_unlock(void *);
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 23f9762f4e8..00798aa9f42 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vnops.c,v 1.61 2021/07/19 01:30:24 dholland Exp $ */
+/* $NetBSD: cd9660_vnops.c,v 1.62 2022/03/27 17:10:55 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.61 2021/07/19 01:30:24 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.62 2022/03/27 17:10:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -662,34 +662,6 @@ cd9660_readlink(void *v)
return (0);
}
-int
-cd9660_link(void *v)
-{
- struct vop_link_v2_args /* {
- struct vnode *a_dvp;
- struct vnode *a_vp;
- struct componentname *a_cnp;
- } */ *ap = v;
-
- VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
- return (EROFS);
-}
-
-int
-cd9660_symlink(void *v)
-{
- struct vop_symlink_v3_args /* {
- struct vnode *a_dvp;
- struct vnode **a_vpp;
- struct componentname *a_cnp;
- struct vattr *a_vap;
- char *a_target;
- } */ *ap = v;
-
- VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
- return (EROFS);
-}
-
/*
* Calculate the logical to physical mapping if not done already,
* then call the device strategy routine.
@@ -856,11 +828,11 @@ const struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
{ &vop_fsync_desc, genfs_nullop }, /* fsync */
{ &vop_seek_desc, genfs_seek }, /* seek */
{ &vop_remove_desc, genfs_eopnotsupp }, /* remove */
- { &vop_link_desc, cd9660_link }, /* link */
+ { &vop_link_desc, genfs_erofs_link }, /* link */
{ &vop_rename_desc, genfs_eopnotsupp }, /* rename */
{ &vop_mkdir_desc, genfs_eopnotsupp }, /* mkdir */
{ &vop_rmdir_desc, genfs_eopnotsupp }, /* rmdir */
- { &vop_symlink_desc, cd9660_symlink }, /* symlink */
+ { &vop_symlink_desc, genfs_erofs_symlink }, /* symlink */
{ &vop_readdir_desc, cd9660_readdir }, /* readdir */
{ &vop_readlink_desc, cd9660_readlink }, /* readlink */
{ &vop_abortop_desc, genfs_abortop }, /* abortop */
diff --git a/sys/fs/filecorefs/filecore_node.h b/sys/fs/filecorefs/filecore_node.h
index 62dfa470b3b..40dd99c1df5 100644
--- a/sys/fs/filecorefs/filecore_node.h
+++ b/sys/fs/filecorefs/filecore_node.h
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_node.h,v 1.7 2021/07/18 23:57:14 dholland Exp $ */
+/* $NetBSD: filecore_node.h,v 1.8 2022/03/27 17:10:55 christos Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -119,8 +119,6 @@ int filecore_readdir(void *);
int filecore_readlink(void *);
int filecore_inactive(void *);
int filecore_reclaim(void *);
-int filecore_link(void *);
-int filecore_symlink(void *);
int filecore_bmap(void *);
int filecore_strategy(void *);
int filecore_print(void *);
diff --git a/sys/fs/filecorefs/filecore_vnops.c b/sys/fs/filecorefs/filecore_vnops.c
index 4697707fc8c..ff56f80a0e8 100644
--- a/sys/fs/filecorefs/filecore_vnops.c
+++ b/sys/fs/filecorefs/filecore_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vnops.c,v 1.49 2021/07/18 23:57:14 dholland Exp $ */
+/* $NetBSD: filecore_vnops.c,v 1.50 2022/03/27 17:10:55 christos Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.49 2021/07/18 23:57:14 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.50 2022/03/27 17:10:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -416,34 +416,6 @@ filecore_readlink(void *v)
return (EINVAL);
}
-int
-filecore_link(void *v)
-{
- struct vop_link_v2_args /* {
- struct vnode *a_dvp;
- struct vnode *a_vp;
- struct componentname *a_cnp;
- } */ *ap = v;
-
- VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
- return (EROFS);
-}
-
-int
-filecore_symlink(void *v)
-{
- struct vop_symlink_v3_args /* {
- struct vnode *a_dvp;
- struct vnode **a_vpp;
- struct componentname *a_cnp;
- struct vattr *a_vap;
- char *a_target;
- } */ *ap = v;
-
- VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
- return (EROFS);
-}
-
/*
* Calculate the logical to physical mapping if not done already,
* then call the device strategy routine.
@@ -559,11 +531,11 @@ const struct vnodeopv_entry_desc filecore_vnodeop_entries[] = {
{ &vop_fsync_desc, genfs_nullop }, /* fsync */
{ &vop_seek_desc, genfs_seek }, /* seek */
{ &vop_remove_desc, genfs_eopnotsupp }, /* remove */
- { &vop_link_desc, filecore_link }, /* link */
+ { &vop_link_desc, genfs_erofs_link }, /* link */
{ &vop_rename_desc, genfs_eopnotsupp }, /* rename */
{ &vop_mkdir_desc, genfs_eopnotsupp }, /* mkdir */
{ &vop_rmdir_desc, genfs_eopnotsupp }, /* rmdir */
- { &vop_symlink_desc, filecore_symlink }, /* symlink */
+ { &vop_symlink_desc, genfs_erofs_symlink }, /* symlink */
{ &vop_readdir_desc, filecore_readdir }, /* readdir */
{ &vop_readlink_desc, filecore_readlink }, /* readlink */
{ &vop_abortop_desc, genfs_abortop }, /* abortop */