mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2025-12-23 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore data_version in scoutfs_ioc_data_wait_err.

Browse Source 
The data_wait_err ioctl currently requires the correct data_version
for the inode to be passed in, or else the ioctl returns -ESTALE. But
the ioctl itself is just a passthrough mechanism for notifying data
waiters, which doesn't involve the data_version at all.

Instead, we can just drop checking the value. The field remains in the
headers, but we've marked it as being ignored from now on. The reason
for the change is documented in the header file as well.

This all is a lot simpler than having to modify/rev the data_waiters
interface to support passing back the data_version, because there isn't
any space left to easily do this, and then userspace would just pass it
back to the data_wait_err ioctl.

Signed-off-by: Auke Kok <auke.kok@versity.com>
This commit is contained in:
Auke Kok
2025-09-12 10:33:09 -07:00
parent 79cd25f693
commit a4d25d9b55
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kmod/src/ioctl.c
View File

@@ -441,8 +441,6 @@ static long scoutfs_ioc_data_wait_err(struct file *file, unsigned long arg)
if (!S_ISREG(inode->i_mode)) { if (!S_ISREG(inode->i_mode)) {
ret = -EINVAL; ret = -EINVAL;
} else if (scoutfs_inode_data_version(inode) != args.data_version) {
ret = -ESTALE;
} else { } else {
ret = scoutfs_data_wait_err(inode, sblock, eblock, args.op, ret = scoutfs_data_wait_err(inode, sblock, eblock, args.op,
args.err); args.err);

7
kmod/src/ioctl.h
View File

@@ -366,10 +366,15 @@ struct scoutfs_ioctl_statfs_more {
* *
* Find current waiters that match the inode, op, and block range to wake * Find current waiters that match the inode, op, and block range to wake
* up and return an error. * up and return an error.
*
* (*) ca. v1.25 and earlier required that the data_version passed match
* that of the waiter, but this check is removed. It was never needed
* because no data is modified during this ioctl. Any data_version value
* here is thus since then ignored.
*/ */
struct scoutfs_ioctl_data_wait_err { struct scoutfs_ioctl_data_wait_err {
__u64 ino; __u64 ino;
__u64 data_version; __u64 data_version; /* Ignored, see above (*) */
__u64 offset; __u64 offset;
__u64 count; __u64 count;
__u64 op; __u64 op;