From: Sebastien Marie <semarie@kapouay.eu.org>
Subject: patch: vfs: reorder tmpfs_fifovops: isolate fifo_vops block
To: tech@openbsd.org
Date: Tue, 07 May 2024 11:16:44 +0200

Hi,

While checking if all spec_vops/fifo_vops are in sync, I found that
`struct tmpfs_fifovops` doesn't respect the convention to have specific
part isolated from fifo_vops block.

I separated the local part from the fifo_vops part, and add a comment to
keep in sync.

No functional changes intented.

Comments or OK ?
-- 
Sebastien Marie

diff fcda66f0bdb8a3e59b1984bbac1ddf6ab4e00471 refs/heads/vfs
commit - fcda66f0bdb8a3e59b1984bbac1ddf6ab4e00471
commit + db4214956b5ba7d889c34efa61290ab4f06040fb
blob - 2e6d266fa3e10ab5fb79fbbb5c6946318ae47ef8
blob + 3d629f095b8e066def7fb39f0e3c9cd3e30ed6e7
--- sys/tmpfs/tmpfs_fifoops.c
+++ sys/tmpfs/tmpfs_fifoops.c
@@ -53,20 +53,29 @@ int	tmpfs_fifo_fsync	(void *);
  */
 
 const struct vops tmpfs_fifovops = {
-	.vop_lookup	= vop_generic_lookup,
-	.vop_create	= vop_generic_badop,
-	.vop_mknod	= vop_generic_badop,
-	.vop_open	= fifo_open,
-	.vop_close	= fifo_close,
 	.vop_access	= tmpfs_access,
 	.vop_getattr	= tmpfs_getattr,
 	.vop_setattr	= tmpfs_setattr,
 	.vop_read	= tmpfs_fifo_read,
 	.vop_write	= tmpfs_fifo_write,
+	.vop_fsync	= tmpfs_fifo_fsync,
+	.vop_inactive	= tmpfs_inactive,
+	.vop_reclaim	= tmpfs_reclaim,
+	.vop_lock	= tmpfs_lock,
+	.vop_unlock	= tmpfs_unlock,
+	.vop_print	= tmpfs_print,
+	.vop_islocked	= tmpfs_islocked,
+	.vop_bwrite	= tmpfs_bwrite,
+
+	/* XXX: Keep in sync with fifo_vops. */
+	.vop_lookup	= vop_generic_lookup,
+	.vop_create	= vop_generic_badop,
+	.vop_mknod	= vop_generic_badop,
+	.vop_open	= fifo_open,
+	.vop_close	= fifo_close,
 	.vop_ioctl	= fifo_ioctl,
 	.vop_kqfilter	= fifo_kqfilter,
 	.vop_revoke	= vop_generic_revoke,
-	.vop_fsync	= tmpfs_fifo_fsync,
 	.vop_remove	= vop_generic_badop,
 	.vop_link	= vop_generic_badop,
 	.vop_rename	= vop_generic_badop,
@@ -76,17 +85,10 @@ const struct vops tmpfs_fifovops = {
 	.vop_readdir	= vop_generic_badop,
 	.vop_readlink	= vop_generic_badop,
 	.vop_abortop	= vop_generic_badop,
-	.vop_inactive	= tmpfs_inactive,
-	.vop_reclaim	= tmpfs_reclaim,
-	.vop_lock	= tmpfs_lock,
-	.vop_unlock	= tmpfs_unlock,
 	.vop_bmap	= vop_generic_bmap,
 	.vop_strategy	= vop_generic_badop,
-	.vop_print	= tmpfs_print,
-	.vop_islocked	= tmpfs_islocked,
 	.vop_pathconf	= fifo_pathconf,
 	.vop_advlock	= fifo_advlock,
-	.vop_bwrite	= tmpfs_bwrite,
 };
 
 int