Name ufs_vop_[gs]etextattr() consistently with the rest of our VOPs and

put then in the ufs_vnops where they belong, rather than in the ffs_vnops.

Ok'ed by:	rwatson
Sponsored by:	DARPA & NAI Labs.

4 files changed, 16 insertions, 16 deletions

diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 8693bde..6615222 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -79,10 +79,6 @@ static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
 	{ &vop_read_desc,		(vop_t *) ffs_read },
 	{ &vop_reallocblks_desc,	(vop_t *) ffs_reallocblks },
 	{ &vop_write_desc,		(vop_t *) ffs_write },
-#ifdef UFS_EXTATTR
-	{ &vop_getextattr_desc, 	(vop_t *) ufs_vop_getextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ufs_vop_setextattr },
-#endif
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc ffs_vnodeop_opv_desc =
@@ -92,10 +88,6 @@ vop_t **ffs_specop_p;
 static struct vnodeopv_entry_desc ffs_specop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) ufs_vnoperatespec },
 	{ &vop_fsync_desc,		(vop_t *) ffs_fsync },
-#ifdef UFS_EXTATTR
-	{ &vop_getextattr_desc,		(vop_t *) ufs_vop_getextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ufs_vop_setextattr },
-#endif
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc ffs_specop_opv_desc =
@@ -104,10 +96,6 @@ static struct vnodeopv_desc ffs_specop_opv_desc =
 vop_t **ffs_fifoop_p;
 static struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) ufs_vnoperatefifo },
-#ifdef UFS_EXTATTR
-	{ &vop_getextattr_desc,		(vop_t *) ufs_vop_getextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ufs_vop_setextattr },
-#endif
 	{ &vop_fsync_desc,		(vop_t *) ffs_fsync },
 	{ NULL, NULL }
 };
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index 4f56de9..70f1b9c 100644
--- a/sys/ufs/ufs/extattr.h
+++ b/sys/ufs/ufs/extattr.h
@@ -101,8 +101,8 @@ int	ufs_extattr_autostart(struct mount *mp, struct thread *td);
 int	ufs_extattr_stop(struct mount *mp, struct thread *td);
 int	ufs_extattrctl(struct mount *mp, int cmd, struct vnode *filename,
 	    int attrnamespace, const char *attrname, struct thread *td);
-int	ufs_vop_getextattr(struct vop_getextattr_args *ap);
-int	ufs_vop_setextattr(struct vop_setextattr_args *ap);
+int	ufs_getextattr(struct vop_getextattr_args *ap);
+int	ufs_setextattr(struct vop_setextattr_args *ap);
 void	ufs_extattr_vnode_inactive(struct vnode *vp, struct thread *td);
 
 #endif /* !_KERNEL */
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 2cb87fc..92469a6 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -823,7 +823,7 @@ ufs_extattr_credcheck(struct vnode *vp, struct ufs_extattr_list_entry *uele,
  * Vnode operating to retrieve a named extended attribute.
  */
 int
-ufs_vop_getextattr(struct vop_getextattr_args *ap)
+ufs_getextattr(struct vop_getextattr_args *ap)
 /*
 vop_getextattr {
 	IN struct vnode *a_vp;
@@ -1000,7 +1000,7 @@ vopunlock_exit:
  * Vnode operation to set a named attribute.
  */
 int
-ufs_vop_setextattr(struct vop_setextattr_args *ap)
+ufs_setextattr(struct vop_setextattr_args *ap)
 /*
 vop_setextattr {
 	IN struct vnode *a_vp;
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index a693e4a..4f3bc67 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -2574,6 +2574,10 @@ static struct vnodeopv_entry_desc ufs_vnodeop_entries[] = {
 	{ &vop_symlink_desc,		(vop_t *) ufs_symlink },
 	{ &vop_unlock_desc,		(vop_t *) vop_stdunlock },
 	{ &vop_whiteout_desc,		(vop_t *) ufs_whiteout },
+#ifdef UFS_EXTATTR
+	{ &vop_getextattr_desc,		(vop_t *) ufs_getextattr },
+	{ &vop_setextattr_desc,		(vop_t *) ufs_setextattr },
+#endif
 #ifdef UFS_ACL
 	{ &vop_getacl_desc,		(vop_t *) ufs_getacl },
 	{ &vop_setacl_desc,		(vop_t *) ufs_setacl },
@@ -2600,6 +2604,10 @@ static struct vnodeopv_entry_desc ufs_specop_entries[] = {
 	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
 	{ &vop_unlock_desc,		(vop_t *) vop_stdunlock },
 	{ &vop_write_desc,		(vop_t *) ufsspec_write },
+#ifdef UFS_EXTATTR
+	{ &vop_getextattr_desc,		(vop_t *) ufs_getextattr },
+	{ &vop_setextattr_desc,		(vop_t *) ufs_setextattr },
+#endif
 #ifdef UFS_ACL
 	{ &vop_getacl_desc,		(vop_t *) ufs_getacl },
 	{ &vop_setacl_desc,		(vop_t *) ufs_setacl },
@@ -2627,6 +2635,10 @@ static struct vnodeopv_entry_desc ufs_fifoop_entries[] = {
 	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
 	{ &vop_unlock_desc,		(vop_t *) vop_stdunlock },
 	{ &vop_write_desc,		(vop_t *) ufsfifo_write },
+#ifdef UFS_EXTATTR
+	{ &vop_getextattr_desc,		(vop_t *) ufs_getextattr },
+	{ &vop_setextattr_desc,		(vop_t *) ufs_setextattr },
+#endif
 #ifdef UFS_ACL
 	{ &vop_getacl_desc,		(vop_t *) ufs_getacl },
 	{ &vop_setacl_desc,		(vop_t *) ufs_setacl },