Optionalize per-kver-style packages during transition period

v1.30 Release

ReleaseNotes.md

@@ -1,6 +1,23 @@
 Versity ScoutFS Release Notes
 =============================
 
+---
+v1.30
+\
+*Apr 21, 2026*
+
+Fix a problem reading the accumulated totals of contributing .totl.
+xattrs when log merging is in progress.  The problem would have readers
+of the totals calculate the sums incorrectly.
+
+Fix a problem updating quota rules.  There was a race where updates
+could be corrupted if they happened while a transaction was being
+written.
+
+Fix a problem deleting files with .indx. xattrs.  The internal indexing
+metadata wouldn't be properly deleted so the files would still claim to
+be present and visible in the index, though the file no longer existed.
+
 ---
 v1.29
 \

kmod/scoutfs-kmod.spec.in

@@ -4,9 +4,15 @@
 %define kmod_git_describe @@GITDESCRIBE@@
 %define pkg_date %(date +%%Y%%m%%d)
 
+# Package type: set --define 'per_kver 1' to tie the package to a specific kernel
+# version (per-kver mode); leave unset for the default per-minor-release behavior.
+
 # take kernel version or default to uname -r
 %{!?kversion: %global kversion %(uname -r)}
 %global kernel_version %{kversion}
+%if 0%{?per_kver}
+%define sanitized_kernel_version %(echo %{kernel_version} | tr - _ |sed -e 's/.x86_64//')
+%endif
 
 %if 0%{?el7}
 %global kernel_source() /usr/src/kernels/%{kernel_version}.$(arch)
@@ -17,16 +23,34 @@
 %{!?_release: %global _release 0.%{pkg_date}git%{kmod_git_hash}}
 
 %if 0%{?el7}
+%if 0%{?per_kver}
+Name:           %{kmod_name}-%{sanitized_kernel_version}
+Provides:       %{kmod_name} = %{kmod_version}
+%else
 Name:           %{kmod_name}
+%endif
+%else
+%if 0%{?per_kver}
+Name:           kmod-%{kmod_name}-%{sanitized_kernel_version}
+Provides:       kmod-%{kmod_name} = %{kmod_version}
 %else
 Name:           kmod-%{kmod_name}
 %endif
+%endif
 Summary:        %{kmod_name} kernel module
 Version:        %{kmod_version}
+%if 0%{?per_kver}
+Release:        %{_release}
+%else
 Release:        %{_release}%{?dist}
+%endif
 License:        GPLv2
 Group:          System/Kernel
 URL:            http://scoutfs.org/
+%if 0%{?per_kver}
+Requires:       kernel-core-uname-r = %{kernel_version}
+Requires:       kernel-modules-uname-r = %{kernel_version}
+%endif
 
 %if 0%{?el7}
 BuildRequires:  %{kernel_module_package_buildreqs}

kmod/src/block.c

@@ -467,6 +467,9 @@ static int block_submit_bio(struct super_block *sb, struct block_private *bp,
 	sector_t sector;
 	int ret = 0;
 
+	if (scoutfs_forcing_unmount(sb))
+		return -ENOLINK;
+
 	sector = bp->bl.blkno << (SCOUTFS_BLOCK_LG_SHIFT - 9);
 
 	WARN_ON_ONCE(bp->bl.blkno == U64_MAX);
@@ -477,17 +480,6 @@ static int block_submit_bio(struct super_block *sb, struct block_private *bp,
 	set_bit(BLOCK_BIT_IO_BUSY, &bp->bits);
 	block_get(bp);
 
-	/*
-	 * A second thread may already be waiting on this block's completion
-	 * after this thread won the race to submit the block.  We exit through
-	 * the block_end_io error path which sets BLOCK_BIT_ERROR and assures
-	 * that other callers in the waitq get woken up.
-	 */
-	if (scoutfs_forcing_unmount(sb)) {
-		ret = -ENOLINK;
-		goto end_io;
-	}
-
 	blk_start_plug(&plug);
 
 	for (off = 0; off < SCOUTFS_BLOCK_LG_SIZE; off += PAGE_SIZE) {
@@ -525,7 +517,6 @@ static int block_submit_bio(struct super_block *sb, struct block_private *bp,
 
 	blk_finish_plug(&plug);
 
-end_io:
 	/* let racing end_io know we're done */
 	block_end_io(sb, opf, bp, ret);