1 Commits
v1.28 ... v1.29

Author SHA1 Message Date
William Gill
5730d95892 v1.29-notify-1: patches for scoutfs v1.29
Backport of the three notify patches onto scoutfs v1.29 as its own
long-lived branch.  Rebase was clean: v1.29 -> v1.30 touches
btree/forest/quota/totl/triggers/wkic/xattr, none of which our
patches modify, so the three commits apply unchanged.

Branch purpose: scoutfs-build's multi-version pipeline checks out
this branch (via SCOUTFS_NOTIFY_REF=v1.29-notify-1) when building
kmod RPMs for scoutfs v1.29.  Each currently-supported scoutfs
version has its own branch in this repo.
2026-04-23 08:59:34 -05:00
4 changed files with 15 additions and 15 deletions

View File

@@ -1 +1 @@
v1.28
v1.29

View File

@@ -1,4 +1,4 @@
From 1be639b8a4fdfaac37fc5801a314d080200105cb Mon Sep 17 00:00:00 2001
From 01ff9e270c2ef3818abdf6034d2bd090aec4f4a7 Mon Sep 17 00:00:00 2001
From: William Gill <claude@williamgill.net>
Date: Wed, 22 Apr 2026 14:38:51 -0500
Subject: [PATCH 1/3] notify: core file-access notification infrastructure
@@ -84,7 +84,7 @@ index 9088496..94e4f44 100644
EXPAND_COUNTER(orphan_scan_attempts) \
EXPAND_COUNTER(orphan_scan_cached) \
diff --git a/kmod/src/ioctl.c b/kmod/src/ioctl.c
index 7a73d4d..9893559 100644
index 0a5fc4c..b3a4d9a 100644
--- a/kmod/src/ioctl.c
+++ b/kmod/src/ioctl.c
@@ -47,6 +47,7 @@
@@ -95,22 +95,22 @@ index 7a73d4d..9893559 100644
#include "scoutfs_trace.h"
#include "util.h"
@@ -1718,6 +1719,8 @@ long scoutfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return scoutfs_ioc_mod_quota_rule(file, arg, false);
case SCOUTFS_IOC_READ_XATTR_INDEX:
@@ -1790,6 +1791,8 @@ long scoutfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return scoutfs_ioc_read_xattr_index(file, arg);
case SCOUTFS_IOC_PUNCH_OFFLINE:
return scoutfs_ioc_punch_offline(file, arg);
+ case SCOUTFS_IOC_READ_NOTIFY:
+ return scoutfs_ioc_read_notify(file, arg);
}
return -ENOTTY;
diff --git a/kmod/src/ioctl.h b/kmod/src/ioctl.h
index cefecd4..23fda13 100644
index c0d2285..d468d4c 100644
--- a/kmod/src/ioctl.h
+++ b/kmod/src/ioctl.h
@@ -848,4 +848,88 @@ struct scoutfs_ioctl_read_xattr_index {
#define SCOUTFS_IOC_READ_XATTR_INDEX \
_IOR(SCOUTFS_IOCTL_MAGIC, 23, struct scoutfs_ioctl_read_xattr_index)
@@ -876,4 +876,88 @@ struct scoutfs_ioctl_punch_offline {
#define SCOUTFS_IOC_PUNCH_OFFLINE \
_IOW(SCOUTFS_IOCTL_MAGIC, 24, struct scoutfs_ioctl_punch_offline)
+/*
+ * File access notification stream (observer-only).

View File

@@ -1,4 +1,4 @@
From e970d4d8c6ab1f13cc7e2e51a830ba2f387b62d3 Mon Sep 17 00:00:00 2001
From f4abcb49aa3477fc654a435798e5e9efeea44e12 Mon Sep 17 00:00:00 2001
From: William Gill <claude@williamgill.net>
Date: Wed, 22 Apr 2026 14:40:04 -0500
Subject: [PATCH 2/3] notify: file open/read hook sites
@@ -37,7 +37,7 @@ Nothing in the data-waiter state machine is touched.
2 files changed, 39 insertions(+)
diff --git a/kmod/src/data.c b/kmod/src/data.c
index 7903e8d..6e3b133 100644
index 0abb48c..33a61af 100644
--- a/kmod/src/data.c
+++ b/kmod/src/data.c
@@ -41,6 +41,7 @@
@@ -48,7 +48,7 @@ index 7903e8d..6e3b133 100644
/*
* We want to amortize work done after dirtying the shared transaction
@@ -2207,6 +2208,32 @@ const struct address_space_operations scoutfs_file_aops = {
@@ -2304,6 +2305,32 @@ const struct address_space_operations scoutfs_file_aops = {
.write_end = scoutfs_write_end,
};
@@ -81,7 +81,7 @@ index 7903e8d..6e3b133 100644
const struct file_operations scoutfs_file_fops = {
#ifdef KC_LINUX_HAVE_FOP_AIO_READ
.read = do_sync_read,
@@ -2219,6 +2246,7 @@ const struct file_operations scoutfs_file_fops = {
@@ -2316,6 +2343,7 @@ const struct file_operations scoutfs_file_fops = {
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
#endif

View File

@@ -1,4 +1,4 @@
From a227eecabc78f331fcb8c483e6051021cb44a94b Mon Sep 17 00:00:00 2001
From c2793743cdc635f54edb1ed2a8020a9f1ca47315 Mon Sep 17 00:00:00 2001
From: William Gill <claude@williamgill.net>
Date: Wed, 22 Apr 2026 14:40:34 -0500
Subject: [PATCH 3/3] notify: scoutfs-notifyd userspace relay daemon (Go 1.26)