v1.2.1

Author: kusumi

CHANGES

@@ -1,3 +1,10 @@
+v1.2.1
+======
+- Add VOP's
+- Reduce diff vs other BSD's
+- Add patch/openbsd74.patch
+- Remove patch/openbsd73.patch
+
 v1.2.0
 ======
 - Add VOP's

README.md

@@ -3,13 +3,13 @@ OpenBSD [HAMMER2](https://gitweb.dragonflybsd.org/dragonfly.git/blob/HEAD:/sys/v
 
 ## Requirements
 
-+ OpenBSD 7.3
++ OpenBSD 7.4
 
 + src tree under /usr/src
 
 ## OpenBSD build
 
-1. Apply [patch/openbsd73.patch](patch/openbsd73.patch) against /usr/src.
+1. Apply [patch/openbsd74.patch](patch/openbsd74.patch) against /usr/src.
 
 2. Run *make prep* to create symlinks under /usr/src/sys which point to this repository. Run *make unprep* to undo.
 

patch/openbsd73.patch patch/openbsd74.patchpatch/openbsd73.patch renamed to patch/openbsd74.patch

@@ -1,8 +1,8 @@
 diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
-index 85cf42336..d6c4c4035 100644
+index 95b91489e..f1d225c31 100644
 --- a/distrib/sets/lists/comp/mi
 +++ b/distrib/sets/lists/comp/mi
-@@ -908,6 +908,10 @@
+@@ -914,6 +914,10 @@
  ./usr/include/getopt.h
  ./usr/include/glob.h
  ./usr/include/grp.h
@@ -26,7 +26,7 @@ index 6454e1dc8..ce5e90f9c 100644
  afterinstall:
  	ln -sf ../../sbin/sysctl ${DESTDIR}/usr/sbin
 diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
-index e7ce92199..9ac03a992 100644
+index c22bd4b94..e154c2c33 100644
 --- a/sbin/sysctl/sysctl.c
 +++ b/sbin/sysctl/sysctl.c
 @@ -91,6 +91,8 @@
@@ -38,15 +38,15 @@ index e7ce92199..9ac03a992 100644
  #include <ddb/db_var.h>
 
  #include <ctype.h>
-@@ -1250,6 +1252,7 @@ struct ctlname vfsgennames[] = CTL_VFSGENCTL_NAMES;
+@@ -1257,6 +1259,7 @@ struct ctlname vfsgennames[] = CTL_VFSGENCTL_NAMES;
  struct ctlname ffsname[] = FFS_NAMES;
  struct ctlname nfsname[] = FS_NFS_NAMES;
  struct ctlname fusefsname[] = FUSEFS_NAMES;
 +struct ctlname hammer2name[] = HAMMER2_NAMES;
  struct list *vfsvars;
  int *vfs_typenums;
 
-@@ -1312,6 +1315,10 @@ vfsinit(void)
+@@ -1319,6 +1322,10 @@ vfsinit(void)
  			vfsvars[cnt].list = fusefsname;
  			vfsvars[cnt].size = FUSEFS_MAXID;
  		}
@@ -58,7 +58,7 @@ index e7ce92199..9ac03a992 100644
  		strlcat(&names[loc], vfc.vfc_name, sizeof names - loc);
  		vfsname[cnt].ctl_name = &names[loc];
 diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
-index f7bb589c8..5e57732c5 100644
+index c10d1268f..1d83ac46f 100644
 --- a/sys/conf/GENERIC
 +++ b/sys/conf/GENERIC
 @@ -42,6 +42,7 @@ option		MSDOSFS		# MS-DOS file system
@@ -70,10 +70,10 @@ index f7bb589c8..5e57732c5 100644
  option		SOCKET_SPLICE	# Socket Splicing for TCP and UDP
  option		TCP_ECN		# Explicit Congestion Notification for TCP
 diff --git a/sys/conf/files b/sys/conf/files
-index 661140040..2bb78275c 100644
+index 2a05c7cd0..d03238292 100644
 --- a/sys/conf/files
 +++ b/sys/conf/files
-@@ -804,6 +804,23 @@ file tmpfs/tmpfs_vfsops.c		tmpfs
+@@ -809,6 +809,23 @@ file tmpfs/tmpfs_vfsops.c		tmpfs
  file tmpfs/tmpfs_vnops.c		tmpfs
  file tmpfs/tmpfs_specops.c		tmpfs
  file tmpfs/tmpfs_fifoops.c		tmpfs & fifo
@@ -97,7 +97,7 @@ index 661140040..2bb78275c 100644
  file net/art.c
  file net/bpf.c				bpfilter		needs-count
  file net/bpf_filter.c			bpfilter
-@@ -1041,6 +1058,7 @@ file lib/libkern/getsn.c
+@@ -1047,6 +1064,7 @@ file lib/libkern/getsn.c
  file lib/libkern/random.c
  file lib/libkern/explicit_bzero.c
  file lib/libkern/timingsafe_bcmp.c
@@ -122,7 +122,7 @@ index 84c00f0e4..59715d5d8 100644
 
 
 diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
-index e6a175e9f..f3c491bf3 100644
+index 765b70a09..c764d3469 100644
 --- a/sys/kern/vfs_vnops.c
 +++ b/sys/kern/vfs_vnops.c
 @@ -517,7 +517,8 @@ vn_ioctl(struct file *fp, u_long com, caddr_t data, struct proc *p)
@@ -136,12 +136,12 @@ index e6a175e9f..f3c491bf3 100644
  	case VFIFO:
  	case VCHR:
 diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
-index 97bf9ff60..4f8b6fd6f 100644
+index 81fcbcfc3..a28cd44f7 100644
 --- a/sys/sys/malloc.h
 +++ b/sys/sys/malloc.h
 @@ -177,7 +177,11 @@
 
- #define M_DRM		145	/* Direct Rendering Manager */
+ #define	M_DRM		145	/* Direct Rendering Manager */
 
 -#define	M_LAST		146	/* Must be last type + 1 */
 +#define	M_HAMMER2	146	/* HAMMER2 */
@@ -163,7 +163,7 @@ index 97bf9ff60..4f8b6fd6f 100644
 
  struct kmemstats {
 diff --git a/sys/sys/mount.h b/sys/sys/mount.h
-index 40c12e976..d18fa04b4 100644
+index 27bec4f26..bbbfdbfc8 100644
 --- a/sys/sys/mount.h
 +++ b/sys/sys/mount.h
 @@ -257,6 +257,15 @@ struct fusefs_args {
@@ -207,7 +207,7 @@ index 40c12e976..d18fa04b4 100644
  #include <net/radix.h>
  #include <sys/socket.h>		/* XXX for AF_MAX */
 diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
-index 30787afdd..19c4fb12f 100644
+index 994ceb623..fe62b86a6 100644
 --- a/sys/sys/vnode.h
 +++ b/sys/sys/vnode.h
 @@ -67,12 +67,14 @@ enum vtagtype	{

src/sys/fs/hammer2/hammer2.h

@@ -213,8 +213,8 @@ struct hammer2_chain {
 	TAILQ_ENTRY(hammer2_chain) entry;	/* 0-refs LRU */
 	hammer2_mtx_t		lock;
 	hammer2_mtx_t		diolk;		/* xop focus interlock */
-	struct rwlock		inp_lock;
-	char			*inp_cv;
+	hammer2_lk_t		inp_lock;
+	hammer2_lkc_t		inp_cv;
 	hammer2_chain_core_t	core;
 	hammer2_blockref_t	bref;
 	hammer2_dev_t		*hmp;
@@ -440,6 +440,7 @@ struct hammer2_inode {
 	hammer2_depend_t	*depend;	/* non-NULL if SIDEQ */
 	hammer2_depend_t	depend_static;	/* (in-place allocation) */
 	hammer2_mtx_t		lock;		/* inode lock */
+	hammer2_mtx_t		truncate_lock;	/* prevent truncates */
 	struct rrwlock		vnlock;		/* vnode lock */
 	hammer2_spin_t		cluster_spin;	/* update cluster */
 	hammer2_cluster_t	cluster;
@@ -504,7 +505,6 @@ struct hammer2_inode {
  */
 struct hammer2_trans {
 	uint32_t		flags;
-	uint32_t		sync_wait; /* unused */
 };
 
 typedef struct hammer2_trans hammer2_trans_t;
@@ -616,6 +616,14 @@ struct hammer2_xop_scanlhc {
 	hammer2_key_t		lhc;
 };
 
+struct hammer2_xop_scanall {
+	hammer2_xop_head_t	head;
+	hammer2_key_t		key_beg;	/* inclusive */
+	hammer2_key_t		key_end;	/* inclusive */
+	int			resolve_flags;
+	int			lookup_flags;
+};
+
 struct hammer2_xop_lookup {
 	hammer2_xop_head_t	head;
 	hammer2_key_t		lhc;
@@ -654,6 +662,12 @@ struct hammer2_xop_fsync {
 	int			clear_directdata;
 };
 
+struct hammer2_xop_unlinkall {
+	hammer2_xop_head_t	head;
+	hammer2_key_t		key_beg;
+	hammer2_key_t		key_end;
+};
+
 struct hammer2_xop_flush {
 	hammer2_xop_head_t	head;
 };
@@ -669,12 +683,14 @@ typedef struct hammer2_xop_readdir hammer2_xop_readdir_t;
 typedef struct hammer2_xop_nresolve hammer2_xop_nresolve_t;
 typedef struct hammer2_xop_unlink hammer2_xop_unlink_t;
 typedef struct hammer2_xop_scanlhc hammer2_xop_scanlhc_t;
+typedef struct hammer2_xop_scanall hammer2_xop_scanall_t;
 typedef struct hammer2_xop_lookup hammer2_xop_lookup_t;
 typedef struct hammer2_xop_mkdirent hammer2_xop_mkdirent_t;
 typedef struct hammer2_xop_create hammer2_xop_create_t;
 typedef struct hammer2_xop_destroy hammer2_xop_destroy_t;
 typedef struct hammer2_xop_bmap hammer2_xop_bmap_t;
 typedef struct hammer2_xop_fsync hammer2_xop_fsync_t;
+typedef struct hammer2_xop_unlinkall hammer2_xop_unlinkall_t;
 typedef struct hammer2_xop_flush hammer2_xop_flush_t;
 typedef struct hammer2_xop_strategy hammer2_xop_strategy_t;
 
@@ -685,12 +701,14 @@ union hammer2_xop {
 	hammer2_xop_nresolve_t	xop_nresolve;
 	hammer2_xop_unlink_t	xop_unlink;
 	hammer2_xop_scanlhc_t	xop_scanlhc;
+	hammer2_xop_scanall_t	xop_scanall;
 	hammer2_xop_lookup_t	xop_lookup;
 	hammer2_xop_mkdirent_t	xop_mkdirent;
 	hammer2_xop_create_t	xop_create;
 	hammer2_xop_destroy_t	xop_destroy;
 	hammer2_xop_bmap_t	xop_bmap;
 	hammer2_xop_fsync_t	xop_fsync;
+	hammer2_xop_unlinkall_t	xop_unlinkall;
 	hammer2_xop_flush_t	xop_flush;
 	hammer2_xop_strategy_t	xop_strategy;
 };
@@ -824,10 +842,10 @@ struct hammer2_pfs {
 	hammer2_spin_t		inum_spin;	/* inumber lookup */
 	hammer2_spin_t		lru_spin;
 	hammer2_spin_t		list_spin;
-	struct rwlock		xop_lock[HAMMER2_IHASH_SIZE];
-	char			*xop_cv[HAMMER2_IHASH_SIZE];
-	struct rwlock		trans_lock;	/* XXX temporary */
-	char			*trans_cv;
+	hammer2_lk_t		xop_lock[HAMMER2_IHASH_SIZE];
+	hammer2_lkc_t		xop_cv[HAMMER2_IHASH_SIZE];
+	hammer2_lk_t		trans_lock;	/* XXX temporary */
+	hammer2_lkc_t		trans_cv;
 	struct mount		*mp;
 	struct uuid		pfs_clid;
 	hammer2_trans_t		trans;
@@ -896,6 +914,7 @@ extern hammer2_xop_desc_t hammer2_readdir_desc;
 extern hammer2_xop_desc_t hammer2_nresolve_desc;
 extern hammer2_xop_desc_t hammer2_unlink_desc;
 extern hammer2_xop_desc_t hammer2_scanlhc_desc;
+extern hammer2_xop_desc_t hammer2_scanall_desc;
 extern hammer2_xop_desc_t hammer2_lookup_desc;
 extern hammer2_xop_desc_t hammer2_delete_desc;
 extern hammer2_xop_desc_t hammer2_inode_mkdirent_desc;
@@ -905,6 +924,7 @@ extern hammer2_xop_desc_t hammer2_inode_create_ins_desc;
 extern hammer2_xop_desc_t hammer2_inode_destroy_desc;
 extern hammer2_xop_desc_t hammer2_bmap_desc;
 extern hammer2_xop_desc_t hammer2_inode_chain_sync_desc;
+extern hammer2_xop_desc_t hammer2_inode_unlinkall_desc;
 extern hammer2_xop_desc_t hammer2_inode_flush_desc;
 extern hammer2_xop_desc_t hammer2_strategy_read_desc;
 
@@ -918,6 +938,8 @@ int hammer2_xop_feed(hammer2_xop_head_t *, hammer2_chain_t *, int, int);
 int hammer2_xop_collect(hammer2_xop_head_t *, int);
 
 /* hammer2_bulkfree.c */
+void hammer2_bulkfree_init(hammer2_dev_t *);
+void hammer2_bulkfree_uninit(hammer2_dev_t *);
 int hammer2_bulkfree_pass(hammer2_dev_t *, hammer2_chain_t *,
     struct hammer2_ioc_bulkfree *);
 
@@ -973,6 +995,7 @@ void hammer2_cluster_rehold(hammer2_cluster_t *);
 int hammer2_cluster_check(hammer2_cluster_t *, hammer2_key_t, int);
 
 /* hammer2_flush.c */
+void hammer2_trans_manage_init(hammer2_pfs_t *);
 void hammer2_trans_init(hammer2_pfs_t *, uint32_t);
 void hammer2_trans_setflags(hammer2_pfs_t *, uint32_t);
 void hammer2_trans_clearflags(hammer2_pfs_t *, uint32_t);
@@ -1064,6 +1087,7 @@ int hammer2_get_dtype(uint8_t);
 int hammer2_get_vtype(uint8_t);
 uint8_t hammer2_get_obj_type(uint8_t);
 void hammer2_time_to_timespec(uint64_t, struct timespec *);
+uint64_t hammer2_timespec_to_time(const struct timespec *);
 uint32_t hammer2_to_unix_xid(const struct uuid *);
 void hammer2_guid_to_uuid(struct uuid *, uint32_t);
 hammer2_key_t hammer2_dirhash(const char *, size_t);
@@ -1100,6 +1124,7 @@ void hammer2_xop_readdir(hammer2_xop_t *, int);
 void hammer2_xop_nresolve(hammer2_xop_t *, int);
 void hammer2_xop_unlink(hammer2_xop_t *, int);
 void hammer2_xop_scanlhc(hammer2_xop_t *, int);
+void hammer2_xop_scanall(hammer2_xop_t *, int);
 void hammer2_xop_lookup(hammer2_xop_t *, int);
 void hammer2_xop_delete(hammer2_xop_t *, int);
 void hammer2_xop_inode_mkdirent(hammer2_xop_t *, int);
@@ -1109,6 +1134,7 @@ void hammer2_xop_inode_create_ins(hammer2_xop_t *, int);
 void hammer2_xop_inode_destroy(hammer2_xop_t *, int);
 void hammer2_xop_bmap(hammer2_xop_t *, int);
 void hammer2_xop_inode_chain_sync(hammer2_xop_t *, int);
+void hammer2_xop_inode_unlinkall(hammer2_xop_t *, int);
 
 /* XXX no way to return multiple errnos */
 static __inline int