kobako 0.30.0 → 0.31.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (266) hide show
  1. checksums.yaml +4 -4
  2. data/.release-please-manifest.json +1 -1
  3. data/CHANGELOG.md +335 -0
  4. data/Cargo.lock +469 -11
  5. data/README.md +43 -3
  6. data/ROADMAP.md +1 -1
  7. data/crates/kobako-runtime/CHANGELOG.md +219 -0
  8. data/crates/kobako-runtime/Cargo.toml +51 -3
  9. data/crates/kobako-runtime/README.md +7 -4
  10. data/crates/kobako-runtime/src/cred.rs +124 -0
  11. data/crates/kobako-runtime/src/dispatch.rs +4 -5
  12. data/crates/kobako-runtime/src/endpoint/buffer.rs +153 -44
  13. data/crates/kobako-runtime/src/endpoint/dispatch.rs +80 -41
  14. data/crates/kobako-runtime/src/endpoint/invoke.rs +23 -36
  15. data/crates/kobako-runtime/src/endpoint.rs +137 -36
  16. data/crates/kobako-runtime/src/errno.rs +391 -0
  17. data/crates/kobako-runtime/src/error.rs +31 -10
  18. data/crates/kobako-runtime/src/filesystem/anon_inodes.rs +52 -0
  19. data/crates/kobako-runtime/src/filesystem/bind/lookup.rs +52 -14
  20. data/crates/kobako-runtime/src/filesystem/bind/walk.rs +19 -20
  21. data/crates/kobako-runtime/src/filesystem/bind.rs +437 -245
  22. data/crates/kobako-runtime/src/filesystem/overlay/file.rs +6 -6
  23. data/crates/kobako-runtime/src/filesystem/overlay/path.rs +43 -65
  24. data/crates/kobako-runtime/src/filesystem/overlay/stack/copy_up.rs +9 -16
  25. data/crates/kobako-runtime/src/filesystem/overlay/stack/dir.rs +47 -72
  26. data/crates/kobako-runtime/src/filesystem/overlay/stack/namei.rs +12 -12
  27. data/crates/kobako-runtime/src/filesystem/overlay/stack/readdir.rs +4 -7
  28. data/crates/kobako-runtime/src/filesystem/overlay/stack.rs +121 -37
  29. data/crates/kobako-runtime/src/filesystem/overlay.rs +302 -343
  30. data/crates/kobako-runtime/src/filesystem/pipe.rs +12 -9
  31. data/crates/kobako-runtime/src/filesystem/rdir.rs +15 -32
  32. data/crates/kobako-runtime/src/filesystem/tmpfs/seed.rs +32 -0
  33. data/crates/kobako-runtime/src/filesystem/tmpfs/tmpfile.rs +3 -3
  34. data/crates/kobako-runtime/src/filesystem/tmpfs/whiteout.rs +57 -35
  35. data/crates/kobako-runtime/src/filesystem/tmpfs/xattr.rs +2 -2
  36. data/crates/kobako-runtime/src/filesystem/tmpfs.rs +172 -160
  37. data/crates/kobako-runtime/src/filesystem/wrap.rs +36 -52
  38. data/crates/kobako-runtime/src/filesystem.rs +6 -3
  39. data/crates/kobako-runtime/src/fork.rs +96 -0
  40. data/crates/kobako-runtime/src/grant.rs +3 -0
  41. data/crates/kobako-runtime/src/hashtable.rs +4 -2
  42. data/crates/kobako-runtime/src/lib.rs +18 -7
  43. data/crates/kobako-runtime/src/limits.rs +195 -0
  44. data/crates/kobako-runtime/src/locking.rs +10 -0
  45. data/crates/kobako-runtime/src/memcg.rs +383 -0
  46. data/crates/kobako-runtime/src/mount.rs +67 -9
  47. data/crates/kobako-runtime/src/net/backends.rs +43 -0
  48. data/crates/kobako-runtime/src/net/connections.rs +179 -0
  49. data/crates/kobako-runtime/src/net/credential.rs +125 -0
  50. data/crates/kobako-runtime/src/net/egress.rs +160 -0
  51. data/crates/kobako-runtime/src/net/family.rs +181 -0
  52. data/crates/kobako-runtime/src/net/http.rs +2733 -0
  53. data/crates/kobako-runtime/src/net/lookup.rs +285 -0
  54. data/crates/kobako-runtime/src/net/mock.rs +251 -0
  55. data/crates/kobako-runtime/src/net/namespace.rs +1366 -0
  56. data/crates/kobako-runtime/src/net/reactor.rs +531 -0
  57. data/crates/kobako-runtime/src/net/resolv/darwin.rs +275 -0
  58. data/crates/kobako-runtime/src/net/resolv/stub/tests.rs +469 -0
  59. data/crates/kobako-runtime/src/net/resolv/stub.rs +536 -0
  60. data/crates/kobako-runtime/src/net/resolv/windows.rs +248 -0
  61. data/crates/kobako-runtime/src/net/resolv.rs +227 -0
  62. data/crates/kobako-runtime/src/net/socket.rs +870 -0
  63. data/crates/kobako-runtime/src/net/tcp.rs +1588 -0
  64. data/crates/kobako-runtime/src/net/tls.rs +58 -0
  65. data/crates/kobako-runtime/src/net/transport.rs +279 -0
  66. data/crates/kobako-runtime/src/net/udp.rs +1003 -0
  67. data/crates/kobako-runtime/src/net.rs +42 -0
  68. data/crates/kobako-runtime/src/network/builder.rs +177 -0
  69. data/crates/kobako-runtime/src/network/ruleset.rs +777 -0
  70. data/crates/kobako-runtime/src/network.rs +551 -0
  71. data/crates/kobako-runtime/src/policy.rs +16 -0
  72. data/crates/kobako-runtime/src/profile.rs +29 -144
  73. data/crates/kobako-runtime/src/runtime.rs +3 -5
  74. data/crates/kobako-runtime/src/sched.rs +130 -29
  75. data/crates/kobako-runtime/src/security/entry_policy.rs +22 -0
  76. data/crates/kobako-runtime/src/{vfs/cred.rs → security/hooks.rs} +52 -144
  77. data/crates/kobako-runtime/src/security/mount_policy.rs +158 -0
  78. data/crates/kobako-runtime/src/security.rs +101 -196
  79. data/crates/kobako-runtime/src/snapshot.rs +121 -2
  80. data/crates/kobako-runtime/src/vfs/attr.rs +5 -5
  81. data/crates/kobako-runtime/src/vfs/dentry.rs +143 -89
  82. data/crates/kobako-runtime/src/vfs/file.rs +199 -203
  83. data/crates/kobako-runtime/src/vfs/inode.rs +41 -45
  84. data/crates/kobako-runtime/src/vfs/kern_path.rs +38 -42
  85. data/crates/kobako-runtime/src/vfs/mount.rs +10 -9
  86. data/crates/kobako-runtime/src/vfs/namei.rs +829 -700
  87. data/crates/kobako-runtime/src/vfs/namespace.rs +162 -0
  88. data/crates/kobako-runtime/src/vfs/open_files.rs +69 -0
  89. data/crates/kobako-runtime/src/vfs/openat2.rs +3 -3
  90. data/crates/kobako-runtime/src/vfs/path.rs +6 -6
  91. data/crates/kobako-runtime/src/vfs/readdir.rs +6 -6
  92. data/crates/kobako-runtime/src/vfs/stat.rs +159 -23
  93. data/crates/kobako-runtime/src/vfs/super_block.rs +18 -14
  94. data/crates/kobako-runtime/src/vfs/utimes.rs +37 -27
  95. data/crates/kobako-runtime/src/vfs.rs +9 -6
  96. data/crates/kobako-runtime/src/wait.rs +356 -0
  97. data/crates/kobako-transport/CHANGELOG.md +31 -0
  98. data/crates/kobako-transport/Cargo.toml +1 -1
  99. data/crates/kobako-transport/README.md +3 -4
  100. data/crates/kobako-transport/src/abi.rs +78 -72
  101. data/crates/kobako-transport/src/envelope/bytes.rs +17 -6
  102. data/crates/kobako-transport/src/envelope/call.rs +32 -4
  103. data/crates/kobako-transport/src/envelope/error_record.rs +21 -0
  104. data/crates/kobako-transport/src/envelope/name.rs +99 -0
  105. data/crates/kobako-transport/src/envelope/outcome.rs +9 -9
  106. data/crates/kobako-transport/src/envelope/preamble.rs +24 -21
  107. data/crates/kobako-transport/src/envelope/reply.rs +27 -27
  108. data/crates/kobako-transport/src/envelope/unsupported.rs +10 -10
  109. data/crates/kobako-transport/src/envelope.rs +13 -8
  110. data/crates/kobako-wasmtime/CHANGELOG.md +161 -0
  111. data/crates/kobako-wasmtime/Cargo.toml +26 -7
  112. data/crates/kobako-wasmtime/README.md +3 -2
  113. data/crates/kobako-wasmtime/build/preview2.rs +1339 -0
  114. data/crates/kobako-wasmtime/build.rs +16 -0
  115. data/crates/kobako-wasmtime/src/abi.rs +17 -37
  116. data/crates/kobako-wasmtime/src/ambient.rs +33 -18
  117. data/crates/kobako-wasmtime/src/cache.rs +23 -15
  118. data/crates/kobako-wasmtime/src/config.rs +52 -68
  119. data/crates/kobako-wasmtime/src/driver.rs +48 -63
  120. data/crates/kobako-wasmtime/src/exports.rs +143 -17
  121. data/crates/kobako-wasmtime/src/guest.rs +12 -6
  122. data/crates/kobako-wasmtime/src/guest_binary.rs +14 -0
  123. data/crates/kobako-wasmtime/src/imports.rs +42 -18
  124. data/crates/kobako-wasmtime/src/instance_pre.rs +4 -4
  125. data/crates/kobako-wasmtime/src/invocation.rs +74 -12
  126. data/crates/kobako-wasmtime/src/lib.rs +5 -3
  127. data/crates/kobako-wasmtime/src/limiter.rs +70 -5
  128. data/crates/kobako-wasmtime/src/preview1/descriptors.rs +309 -0
  129. data/crates/kobako-wasmtime/src/preview1/differential/mount.rs +5 -15
  130. data/crates/kobako-wasmtime/src/preview1/differential.rs +27 -31
  131. data/crates/kobako-wasmtime/src/preview1/errno.rs +55 -66
  132. data/crates/kobako-wasmtime/src/preview1/fd.rs +327 -296
  133. data/crates/kobako-wasmtime/src/preview1/memory.rs +21 -12
  134. data/crates/kobako-wasmtime/src/preview1/mount_view/wrap.rs +34 -53
  135. data/crates/kobako-wasmtime/src/preview1/mount_view.rs +231 -217
  136. data/crates/kobako-wasmtime/src/preview1/path.rs +56 -121
  137. data/crates/kobako-wasmtime/src/preview1/poll.rs +244 -120
  138. data/crates/kobako-wasmtime/src/preview1/sock.rs +10 -8
  139. data/crates/kobako-wasmtime/src/preview1/testsuite.rs +5 -15
  140. data/crates/kobako-wasmtime/src/preview1.rs +46 -42
  141. data/crates/kobako-wasmtime/src/preview2/abi.rs +227 -0
  142. data/crates/kobako-wasmtime/src/preview2/error.rs +118 -0
  143. data/crates/kobako-wasmtime/src/preview2/filesystem.rs +122 -0
  144. data/crates/kobako-wasmtime/src/preview2/host.rs +3959 -0
  145. data/crates/kobako-wasmtime/src/preview2/http.rs +1503 -0
  146. data/crates/kobako-wasmtime/src/preview2/io.rs +315 -0
  147. data/crates/kobako-wasmtime/src/preview2/sockets.rs +379 -0
  148. data/crates/kobako-wasmtime/src/preview2/table.rs +305 -0
  149. data/crates/kobako-wasmtime/src/preview2.rs +57 -0
  150. data/crates/kobako-wasmtime/src/trap.rs +24 -9
  151. data/crates/kobako-wasmtime/src/wasi.rs +210 -81
  152. data/crates/kobako-wasmtime/wit/deps/cli.wit +233 -0
  153. data/crates/kobako-wasmtime/wit/deps/clocks.wit +162 -0
  154. data/crates/kobako-wasmtime/wit/deps/filesystem.wit +589 -0
  155. data/crates/kobako-wasmtime/wit/deps/http.wit +733 -0
  156. data/crates/kobako-wasmtime/wit/deps/io.wit +299 -0
  157. data/crates/kobako-wasmtime/wit/deps/random.wit +92 -0
  158. data/crates/kobako-wasmtime/wit/deps/sockets.wit +949 -0
  159. data/data/kobako.wasm +0 -0
  160. data/ext/kobako/Cargo.toml +1 -1
  161. data/ext/kobako/src/{runtime/errors.rs → errors.rs} +34 -26
  162. data/ext/kobako/src/{runtime/escape.rs → escape.rs} +42 -11
  163. data/ext/kobako/src/{runtime/filesystem → filesystem}/grants.rs +30 -26
  164. data/ext/kobako/src/{runtime/filesystem → filesystem}/ruby.rs +149 -168
  165. data/ext/kobako/src/{runtime/filesystem.rs → filesystem.rs} +24 -15
  166. data/ext/kobako/src/gvl.rs +306 -0
  167. data/ext/kobako/src/lib.rs +64 -3
  168. data/ext/kobako/src/network/mock.rs +187 -0
  169. data/ext/kobako/src/network.rs +591 -0
  170. data/ext/kobako/src/runtime/bridge.rs +30 -29
  171. data/ext/kobako/src/runtime/snapshot.rs +4 -4
  172. data/ext/kobako/src/runtime.rs +221 -143
  173. data/ext/kobako/src/wire.rs +42 -0
  174. data/lib/kobako/catalog/extensions.rb +14 -2
  175. data/lib/kobako/catalog/flags.rb +3 -5
  176. data/lib/kobako/catalog/grants.rb +5 -4
  177. data/lib/kobako/catalog/handles.rb +5 -27
  178. data/lib/kobako/catalog/mount.rb +11 -3
  179. data/lib/kobako/catalog/network.rb +35 -0
  180. data/lib/kobako/catalog/replacements.rb +28 -0
  181. data/lib/kobako/catalog/services.rb +5 -19
  182. data/lib/kobako/catalog/snippets.rb +3 -18
  183. data/lib/kobako/catalog.rb +3 -0
  184. data/lib/kobako/codec/{utils.rb → boundary.rb} +4 -2
  185. data/lib/kobako/codec/decoder.rb +4 -4
  186. data/lib/kobako/codec/ext_types.rb +3 -3
  187. data/lib/kobako/codec/handle_walk.rb +3 -43
  188. data/lib/kobako/codec/value_budget.rb +132 -40
  189. data/lib/kobako/codec.rb +1 -1
  190. data/lib/kobako/context.rb +24 -11
  191. data/lib/kobako/errors.rb +15 -12
  192. data/lib/kobako/extension.rb +3 -2
  193. data/lib/kobako/filesystem.rb +9 -2
  194. data/lib/kobako/handle.rb +2 -2
  195. data/lib/kobako/names.rb +28 -0
  196. data/lib/kobako/network.rb +210 -0
  197. data/lib/kobako/outcome.rb +7 -7
  198. data/lib/kobako/pool.rb +45 -23
  199. data/lib/kobako/runtime.rb +3 -2
  200. data/lib/kobako/sandbox.rb +92 -35
  201. data/lib/kobako/sandbox_options.rb +41 -106
  202. data/lib/kobako/transport/argument_wrap.rb +64 -0
  203. data/lib/kobako/transport/block_failure.rb +1 -1
  204. data/lib/kobako/transport/dispatcher.rb +6 -6
  205. data/lib/kobako/transport/exposure.rb +26 -15
  206. data/lib/kobako/transport/reflection.rb +21 -4
  207. data/lib/kobako/transport/run.rb +8 -23
  208. data/lib/kobako/transport/yielder.rb +2 -9
  209. data/lib/kobako/transport.rb +1 -0
  210. data/lib/kobako/version.rb +1 -1
  211. data/lib/kobako.rb +6 -2
  212. data/release-please-config.json +15 -0
  213. data/sig/core/thread.rbs +6 -0
  214. data/sig/kobako/catalog/extensions.rbs +2 -0
  215. data/sig/kobako/catalog/grants.rbs +7 -4
  216. data/sig/kobako/catalog/handles.rbs +0 -2
  217. data/sig/kobako/catalog/mount.rbs +3 -1
  218. data/sig/kobako/catalog/network.rbs +20 -0
  219. data/sig/kobako/catalog/replacements.rbs +14 -0
  220. data/sig/kobako/catalog/services.rbs +0 -4
  221. data/sig/kobako/catalog/snippets.rbs +0 -2
  222. data/sig/kobako/codec/{utils.rbs → boundary.rbs} +2 -2
  223. data/sig/kobako/codec/handle_walk.rbs +0 -6
  224. data/sig/kobako/codec/value_budget.rbs +47 -4
  225. data/sig/kobako/context.rbs +3 -1
  226. data/sig/kobako/errors.rbs +4 -4
  227. data/sig/kobako/filesystem.rbs +21 -3
  228. data/sig/kobako/network.rbs +115 -0
  229. data/sig/kobako/outcome.rbs +1 -1
  230. data/sig/kobako/pool.rbs +7 -3
  231. data/sig/kobako/runtime.rbs +32 -3
  232. data/sig/kobako/sandbox.rbs +19 -2
  233. data/sig/kobako/sandbox_options.rbs +29 -38
  234. data/sig/kobako/transport/argument_wrap.rbs +15 -0
  235. data/sig/kobako/transport/error.rbs +1 -1
  236. data/sig/kobako/transport/exposure.rbs +2 -4
  237. data/sig/kobako/transport/reflection.rbs +10 -0
  238. data/sig/kobako/transport/run.rbs +0 -2
  239. data/sig/kobako/transport/yielder.rbs +0 -3
  240. data/sig/kobako/transport.rbs +1 -1
  241. data/sig/kobako.rbs +13 -0
  242. metadata +84 -35
  243. data/crates/kobako-runtime/src/endpoint/capture.rs +0 -115
  244. data/crates/kobako-runtime/src/endpoint/memory_cap.rs +0 -238
  245. data/crates/kobako-runtime/src/filesystem/path.rs +0 -21
  246. data/crates/kobako-runtime/src/vfs/errno.rs +0 -153
  247. data/crates/kobako-runtime/tests/linux_baseline/calls.rs +0 -171
  248. data/crates/kobako-runtime/tests/linux_baseline/concurrent.rs +0 -276
  249. data/crates/kobako-runtime/tests/linux_baseline/kobako.rs +0 -323
  250. data/crates/kobako-runtime/tests/linux_baseline/linux-baseline-expected.txt +0 -16
  251. data/crates/kobako-runtime/tests/linux_baseline/linux.rs +0 -449
  252. data/crates/kobako-runtime/tests/linux_baseline/main.rs +0 -611
  253. data/crates/kobako-runtime/tests/linux_baseline/permissions.rs +0 -236
  254. data/crates/kobako-wasmtime/src/descriptors.rs +0 -200
  255. data/crates/kobako-wasmtime/tests/integration/compile_posture.rs +0 -43
  256. data/crates/kobako-wasmtime/tests/integration/guest_file.rs +0 -1085
  257. data/crates/kobako-wasmtime/tests/integration/main.rs +0 -29
  258. data/crates/kobako-wasmtime/tests/integration/preamble_flags.rs +0 -70
  259. data/crates/kobako-wasmtime/tests/integration/snippet_compile.rs +0 -95
  260. data/crates/kobako-wasmtime/tests/integration/support/mod.rs +0 -30
  261. data/crates/kobako-wasmtime/tests/integration/unanswered_call.rs +0 -86
  262. data/crates/kobako-wasmtime/tests/integration/unsupported_call.rs +0 -51
  263. data/ext/kobako/src/runtime/gvl.rs +0 -147
  264. data/lib/kobako/constant_name.rb +0 -8
  265. data/sig/kobako/constant_name.rbs +0 -3
  266. /data/ext/kobako/src/{runtime/pinned_value.rs → pinned_value.rs} +0 -0
@@ -6,7 +6,7 @@ use std::time::SystemTime;
6
6
 
7
7
  use super::dentry::Dentry;
8
8
  use super::file::FileOperations;
9
- use super::FilesystemError;
9
+ use super::Errno;
10
10
  use crate::locking::RwSemaphoreGuard;
11
11
 
12
12
  /// Apply `attr` to what `dentry` names, as Linux's `notify_change` reaches
@@ -18,7 +18,7 @@ pub(crate) fn notify_change(
18
18
  dentry: &Dentry,
19
19
  held: &RwSemaphoreGuard,
20
20
  attr: &Iattr,
21
- ) -> Result<(), FilesystemError> {
21
+ ) -> Result<(), Errno> {
22
22
  let inode = dentry
23
23
  .inode()
24
24
  .expect("a dentry whose entry is locked names it");
@@ -59,7 +59,7 @@ impl Iattr<'static> {
59
59
  /// A change truncating or extending a file to `len`, moving its modification
60
60
  /// time to the moment it lands, as Linux's `do_truncate` names `ATTR_MTIME`
61
61
  /// with `ATTR_SIZE`.
62
- pub fn size(len: u64) -> Self {
62
+ pub fn for_size(len: u64) -> Self {
63
63
  Self {
64
64
  size: Some(len),
65
65
  atime: None,
@@ -74,12 +74,12 @@ impl Iattr<'static> {
74
74
  pub(crate) fn open_truncate() -> Self {
75
75
  Self {
76
76
  open: true,
77
- ..Self::size(0)
77
+ ..Self::for_size(0)
78
78
  }
79
79
  }
80
80
 
81
81
  /// A change setting the times named, leaving any other as it stands.
82
- pub fn times(atime: Option<SetTime>, mtime: Option<SetTime>) -> Self {
82
+ pub fn for_times(atime: Option<SetTime>, mtime: Option<SetTime>) -> Self {
83
83
  Self {
84
84
  size: None,
85
85
  atime,
@@ -8,14 +8,15 @@
8
8
 
9
9
  use std::any::Any;
10
10
  use std::num::NonZeroUsize;
11
+ use std::sync::atomic::{AtomicUsize, Ordering};
11
12
  use std::sync::{Arc, Condvar, Mutex, MutexGuard, OnceLock, PoisonError, Weak};
12
13
  use std::thread::ThreadId;
13
14
 
14
15
  use lru::LruCache;
15
16
 
16
17
  use super::file::FileOperations;
17
- use super::inode::{Inode, InodeOperations, Lookup};
18
- use super::{FileType, FilesystemError, Kstat, OpenHow, SuperBlock};
18
+ use super::inode::{Identity, Inode, InodeOperations, Lookup};
19
+ use super::{Errno, FileType, Kstat, OpenHow, SuperBlock};
19
20
  use crate::hashtable::Hashtable;
20
21
  use crate::locking::seqlock::SeqLock;
21
22
  use crate::locking::RwSemaphoreGuard;
@@ -28,11 +29,7 @@ pub trait DentryOperations: Send + Sync {
28
29
  /// Whether `dentry`, a name the runtime still holds in `dir`, names what
29
30
  /// it recorded, as `d_revalidate` answers; `false` has the runtime drop
30
31
  /// it and take the name afresh.
31
- fn revalidate(
32
- &self,
33
- dir: &dyn InodeOperations,
34
- dentry: &Dentry,
35
- ) -> Result<bool, FilesystemError>;
32
+ fn revalidate(&self, dir: &dyn InodeOperations, dentry: &Dentry) -> Result<bool, Errno>;
36
33
 
37
34
  /// Whether `dentry` goes once nothing holds it, rather than stay for the
38
35
  /// next walk, as `d_delete` answers. A name whose `revalidate` cannot tell
@@ -63,12 +60,15 @@ pub struct Dentry {
63
60
  /// What the Filesystem keeps on the name, set once, as Linux's
64
61
  /// `d_fsdata` holds a filesystem's own state for a dentry.
65
62
  fsdata: OnceLock<Arc<dyn Any + Send + Sync>>,
66
- /// What answers about this name, as `d_alloc` copies `s_d_op` from the
63
+ /// What answers about this name, as `d_alloc` copies `__s_d_op` from the
67
64
  /// super block.
68
65
  ops: Option<Arc<dyn DentryOperations>>,
69
66
  /// Wakes the walks waiting while another looks this name up, as Linux's
70
67
  /// `d_wait_lookup` waits for `DCACHE_PAR_LOOKUP` to clear.
71
68
  wait: Condvar,
69
+ /// How many mount namespaces stand a mount on it, as Linux's
70
+ /// `DCACHE_MOUNTED` marks a mount point while any mount stands there.
71
+ mounts: AtomicUsize,
72
72
  }
73
73
 
74
74
  /// Where a walk asking for a lookup stands, as `d_alloc_parallel` answers.
@@ -133,9 +133,26 @@ impl Dentry {
133
133
  fsdata: OnceLock::new(),
134
134
  ops,
135
135
  wait: Condvar::new(),
136
+ mounts: AtomicUsize::new(0),
136
137
  })
137
138
  }
138
139
 
140
+ /// A mount stands on it from now on, as Linux's `d_set_mounted`.
141
+ pub(crate) fn d_set_mounted(&self) {
142
+ self.mounts.fetch_add(1, Ordering::SeqCst);
143
+ }
144
+
145
+ /// A mount standing on it is gone, as `unpin_mountpoint` lets go of it and
146
+ /// `maybe_free_mountpoint` clears `DCACHE_MOUNTED` once the last one goes.
147
+ pub(crate) fn unpin_mountpoint(&self) {
148
+ self.mounts.fetch_sub(1, Ordering::SeqCst);
149
+ }
150
+
151
+ /// Whether a mount stands on it, as Linux's `d_mountpoint`.
152
+ pub(crate) fn d_mountpoint(&self) -> bool {
153
+ self.mounts.load(Ordering::SeqCst) > 0
154
+ }
155
+
139
156
  /// What answers about this name, the same for every dentry of one
140
157
  /// Filesystem.
141
158
  pub fn ops(&self) -> Option<&Arc<dyn DentryOperations>> {
@@ -189,7 +206,7 @@ impl Dentry {
189
206
 
190
207
  /// Each name from the Filesystem's root down to this directory, as Linux's
191
208
  /// `__dentry_path` walks up until `IS_ROOT`.
192
- pub(crate) fn names(&self) -> Vec<String> {
209
+ fn names(&self) -> Vec<String> {
193
210
  RENAME_LOCK.read(|| {
194
211
  let mut names = Vec::new();
195
212
  let mut at = self.get();
@@ -205,14 +222,14 @@ impl Dentry {
205
222
 
206
223
  /// Hold the directory this names shared, as
207
224
  /// `inode_lock_shared(d_inode(dentry))`.
208
- pub(crate) fn inode_lock_shared(&self) -> Result<RwSemaphoreGuard, FilesystemError> {
209
- self.inode().ok_or(FilesystemError::NotFound)?.lock_shared()
225
+ pub(crate) fn inode_lock_shared(&self) -> Result<RwSemaphoreGuard, Errno> {
226
+ self.inode().ok_or(Errno::NotFound)?.lock_shared()
210
227
  }
211
228
 
212
229
  /// Hold the directory this names exclusive, as
213
230
  /// `inode_lock(d_inode(dentry))`.
214
- pub(crate) fn inode_lock(&self) -> Result<RwSemaphoreGuard, FilesystemError> {
215
- self.inode().ok_or(FilesystemError::NotFound)?.lock()
231
+ pub(crate) fn inode_lock(&self) -> Result<RwSemaphoreGuard, Errno> {
232
+ self.inode().ok_or(Errno::NotFound)?.lock()
216
233
  }
217
234
 
218
235
  /// Whether the directory this names was removed or replaced, as
@@ -235,10 +252,10 @@ impl Dentry {
235
252
  }
236
253
 
237
254
  /// What answers for the entry this names, as `d_inode(dentry)->i_op`.
238
- pub(crate) fn inode_ops(&self) -> Result<Arc<dyn InodeOperations>, FilesystemError> {
255
+ pub(crate) fn inode_ops(&self) -> Result<Arc<dyn InodeOperations>, Errno> {
239
256
  match self.inode() {
240
257
  Some(inode) => Ok(inode.ops().clone()),
241
- None => Err(FilesystemError::NotFound),
258
+ None => Err(Errno::NotFound),
242
259
  }
243
260
  }
244
261
 
@@ -249,7 +266,7 @@ impl Dentry {
249
266
  /// must see.
250
267
  pub fn add(&self, inode: Option<Arc<Inode>>) {
251
268
  match inode {
252
- Some(inode) => inode.add_hashed(self),
269
+ Some(inode) => self.hashtables.iget5_locked(inode).add_hashed(self),
253
270
  None => self.rehash(),
254
271
  }
255
272
  }
@@ -301,7 +318,7 @@ impl Dentry {
301
318
  pub(super) fn __instantiate(&self, inode: Arc<Inode>, held: &mut Weak<Dentry>) {
302
319
  let mut state = self.state();
303
320
  if state.inode.is_none() {
304
- if inode.kind() == FileType::Dir {
321
+ if inode.file_type() == FileType::Dir {
305
322
  *held = self.this.clone();
306
323
  }
307
324
  state.inode = Some(inode);
@@ -346,7 +363,7 @@ impl Dentry {
346
363
  &self,
347
364
  sb: &SuperBlock,
348
365
  dir: &Dentry,
349
- ) -> Result<Option<Arc<Dentry>>, FilesystemError> {
366
+ ) -> Result<Option<Arc<Dentry>>, Errno> {
350
367
  let asked = self.ask_in_lookup(|| {
351
368
  let found = dir.inode_ops()?.lookup(self)?;
352
369
  self.splice_alias(sb, found)
@@ -359,8 +376,8 @@ impl Dentry {
359
376
  /// holds the dentry in lookup, and `d_lookup_done` ends that.
360
377
  pub(crate) fn ask_in_lookup<T>(
361
378
  &self,
362
- ask: impl FnOnce() -> Result<T, FilesystemError>,
363
- ) -> Result<Option<T>, FilesystemError> {
379
+ ask: impl FnOnce() -> Result<T, Errno>,
380
+ ) -> Result<Option<T>, Errno> {
364
381
  let ends = match self.begin_lookup()? {
365
382
  InLookup::Answered => return Ok(None),
366
383
  InLookup::Begun => true,
@@ -385,9 +402,9 @@ impl Dentry {
385
402
  &self,
386
403
  sb: &SuperBlock,
387
404
  found: Lookup,
388
- ) -> Result<Option<Arc<Dentry>>, FilesystemError> {
405
+ ) -> Result<Option<Arc<Dentry>>, Errno> {
389
406
  let inode = match found {
390
- Lookup::Found(inode) => inode,
407
+ Lookup::Found(inode) => self.hashtables.iget5_locked(inode),
391
408
  Lookup::Absent => {
392
409
  self.add(None);
393
410
  return Ok(None);
@@ -413,7 +430,7 @@ impl Dentry {
413
430
  sb: &SuperBlock,
414
431
  name: &str,
415
432
  inode: Arc<Inode>,
416
- ) -> Result<Arc<Dentry>, FilesystemError> {
433
+ ) -> Result<Arc<Dentry>, Errno> {
417
434
  let found = sb.dentries().alloc_parallel(&self.parent(), name)?;
418
435
  let spliced = found.ask_in_lookup(|| found.splice_alias(sb, Lookup::Found(inode)))?;
419
436
  Ok(spliced.flatten().unwrap_or(found))
@@ -427,22 +444,18 @@ impl Dentry {
427
444
  /// directory's lock and the instance's `rename_mutex` without waiting,
428
445
  /// since the caller holds the lock of the one it looks the name up in,
429
446
  /// and answers ESTALE where another call holds either.
430
- fn unalias(
431
- self: &Arc<Self>,
432
- sb: &SuperBlock,
433
- alias: &Arc<Dentry>,
434
- ) -> Result<(), FilesystemError> {
447
+ fn unalias(self: &Arc<Self>, sb: &SuperBlock, alias: &Arc<Dentry>) -> Result<(), Errno> {
435
448
  let (parent, name) = self.parent_and_name();
436
449
  let mut table = self.hashtables.dentry_hashtable();
437
450
  RENAME_LOCK.write(|| {
438
451
  if d_ancestor(alias, self) || alias.is_root() {
439
- return Err(FilesystemError::FilesystemLoop);
452
+ return Err(Errno::FilesystemLoop);
440
453
  }
441
454
  let (old_parent, old_name) = alias.parent_and_name();
442
455
  let _held = match Arc::ptr_eq(&old_parent, &parent) {
443
456
  true => None,
444
457
  false => {
445
- let stale = || FilesystemError::StaleNetworkFileHandle;
458
+ let stale = || Errno::StaleNetworkFileHandle;
446
459
  let rename = sb.rename_mutex().down_write_trylock().ok_or_else(stale)?;
447
460
  let dir = old_parent
448
461
  .inode()
@@ -467,7 +480,7 @@ impl Dentry {
467
480
  /// nobody asked yet, once no other walk holds it. A Filesystem asking the
468
481
  /// runtime about the name its own lookup is answering asks it again within
469
482
  /// that lookup, as it would otherwise wait on itself.
470
- fn begin_lookup(&self) -> Result<InLookup, FilesystemError> {
483
+ fn begin_lookup(&self) -> Result<InLookup, Errno> {
471
484
  self.wait_lookup()?;
472
485
  let mut state = self.state();
473
486
  Ok(match state.asked {
@@ -483,7 +496,7 @@ impl Dentry {
483
496
  /// Wait while another walk holds this name in lookup, until the walk's run
484
497
  /// is to stop, as Linux's `d_wait_lookup` does, answering whether the
485
498
  /// calling walk holds it in lookup itself.
486
- fn wait_lookup(&self) -> Result<bool, FilesystemError> {
499
+ fn wait_lookup(&self) -> Result<bool, Errno> {
487
500
  let current = sched::current();
488
501
  loop {
489
502
  let state = self.state();
@@ -494,7 +507,7 @@ impl Dentry {
494
507
  LookupState::Allocated(_) | LookupState::Asking(_)
495
508
  if sched::fatal_signal_pending() =>
496
509
  {
497
- return Err(FilesystemError::Interrupted)
510
+ return Err(Errno::Interrupted)
498
511
  }
499
512
  LookupState::Allocated(_) | LookupState::Asking(_) => {
500
513
  drop(state);
@@ -544,36 +557,36 @@ impl Dentry {
544
557
 
545
558
  /// What kind of entry this records, `NotFound` where it records none, as
546
559
  /// Linux's `d_is_*` read a dentry without asking its filesystem.
547
- pub(crate) fn kind(&self) -> Result<FileType, FilesystemError> {
560
+ pub(crate) fn file_type(&self) -> Result<FileType, Errno> {
548
561
  self.inode()
549
- .map(|inode| inode.kind())
550
- .ok_or(FilesystemError::NotFound)
562
+ .map(|inode| inode.file_type())
563
+ .ok_or(Errno::NotFound)
551
564
  }
552
565
 
553
566
  /// What the entry this records reports of itself, `NotFound` where it
554
567
  /// records none, as `vfs_getattr` asks the inode a dentry holds.
555
- pub(crate) fn getattr(&self) -> Result<Kstat, FilesystemError> {
568
+ pub(crate) fn getattr(&self) -> Result<Kstat, Errno> {
556
569
  match self.inode() {
557
570
  Some(inode) => inode.ops().getattr(self),
558
- None => Err(FilesystemError::NotFound),
571
+ None => Err(Errno::NotFound),
559
572
  }
560
573
  }
561
574
 
562
575
  /// Open the file this records as `how` asks, as `vfs_open` finds
563
576
  /// `f_op->open` on the inode a dentry holds.
564
- pub(crate) fn open(&self, how: &OpenHow) -> Result<Box<dyn FileOperations>, FilesystemError> {
577
+ pub(crate) fn open(&self, how: &OpenHow) -> Result<Box<dyn FileOperations>, Errno> {
565
578
  match self.inode() {
566
579
  Some(inode) => inode.ops().open(self, how),
567
- None => Err(FilesystemError::NotFound),
580
+ None => Err(Errno::NotFound),
568
581
  }
569
582
  }
570
583
 
571
584
  /// Where the link this records points, as `vfs_readlink` asks the inode a
572
585
  /// dentry holds; anything else refuses as `readlinkat` does.
573
- pub(crate) fn get_link(&self) -> Result<String, FilesystemError> {
586
+ pub(crate) fn get_link(&self) -> Result<String, Errno> {
574
587
  match self.inode() {
575
588
  Some(inode) => inode.ops().get_link(self),
576
- None => Err(FilesystemError::NotFound),
589
+ None => Err(Errno::NotFound),
577
590
  }
578
591
  }
579
592
 
@@ -632,9 +645,40 @@ struct Hashtables {
632
645
  /// Those a walk is still looking up, as Linux's `in_lookup_hashtable`, so
633
646
  /// any other walk reaching the name waits for that answer.
634
647
  in_lookup_hashtable: Mutex<Hashtable<Key, Dentry>>,
648
+ /// The directories in use, by the identity each reports, as Linux's
649
+ /// `inode_hashtable`, so a directory a Filesystem answers anew is the
650
+ /// inode it already was and keeps its one dentry.
651
+ inode_hashtable: Mutex<Hashtable<Identity, Inode>>,
635
652
  }
636
653
 
637
654
  impl Hashtables {
655
+ /// The inode in use for the directory `inode` reports, or `inode` itself,
656
+ /// kept for the next lookup, as `iget5_locked` finds a live inode by its
657
+ /// number before it hands a new one. A directory removed is found no more,
658
+ /// and an entry naming no identity is never kept.
659
+ fn iget5_locked(&self, inode: Arc<Inode>) -> Arc<Inode> {
660
+ let Some(identity) = inode
661
+ .identity()
662
+ .filter(|_| inode.file_type() == FileType::Dir)
663
+ else {
664
+ return inode;
665
+ };
666
+ let mut table = self.inode_hashtable();
667
+ match table.get(&identity) {
668
+ Some(found) if found.file_type() == FileType::Dir && !found.is_deaddir() => found,
669
+ _ => {
670
+ table.insert(identity, &inode);
671
+ inode
672
+ }
673
+ }
674
+ }
675
+
676
+ fn inode_hashtable(&self) -> MutexGuard<'_, Hashtable<Identity, Inode>> {
677
+ self.inode_hashtable
678
+ .lock()
679
+ .unwrap_or_else(PoisonError::into_inner)
680
+ }
681
+
638
682
  fn dentry_hashtable(&self) -> MutexGuard<'_, Hashtable<Key, Dentry>> {
639
683
  self.dentry_hashtable
640
684
  .lock()
@@ -664,6 +708,7 @@ impl Dentries {
664
708
  let hashtables = Arc::new(Hashtables {
665
709
  dentry_hashtable: Mutex::default(),
666
710
  in_lookup_hashtable: Mutex::default(),
711
+ inode_hashtable: Mutex::default(),
667
712
  });
668
713
  Self {
669
714
  ops,
@@ -704,7 +749,7 @@ impl Dentries {
704
749
  }
705
750
 
706
751
  /// Have every dentry made from now on answer through `ops`, as
707
- /// `set_default_d_op` sets `s_d_op` for each `d_alloc` after it.
752
+ /// `set_default_d_op` sets `__s_d_op` for each `d_alloc` after it.
708
753
  pub(super) fn set_ops(&mut self, ops: Arc<dyn DentryOperations>) {
709
754
  self.ops = Some(ops);
710
755
  }
@@ -733,7 +778,7 @@ impl Dentries {
733
778
  &self,
734
779
  parent: &Arc<Dentry>,
735
780
  name: &str,
736
- ) -> Result<Arc<Dentry>, FilesystemError> {
781
+ ) -> Result<Arc<Dentry>, Errno> {
737
782
  let at = key(parent, name);
738
783
  loop {
739
784
  let waited = {
@@ -779,14 +824,21 @@ impl Dentries {
779
824
  !dentry.is_root() && !dentry.hashed()
780
825
  }
781
826
 
782
- /// Let go of `dentry`, which no longer names what stands at its name, and
783
- /// of the names kept beneath it, as Linux's `d_invalidate` drops it and
784
- /// shrinks what is below a positive one.
785
- pub(crate) fn invalidate(&self, dentry: &Arc<Dentry>) {
786
- if !dentry.hashed() {
787
- return;
827
+ /// Let go of `dentry`, which no longer names what stood at its name when
828
+ /// `RENAME_LOCK` read `asked`, and of the names kept beneath it, as Linux's
829
+ /// `d_invalidate` drops it and shrinks what is below a positive one. One a
830
+ /// move carried elsewhere since stays where it went: every move takes this
831
+ /// table before it writes, so none lands between the check and the drop.
832
+ pub(crate) fn invalidate(&self, dentry: &Arc<Dentry>, asked: usize) {
833
+ {
834
+ let mut table = self.hashtables.dentry_hashtable();
835
+ if RENAME_LOCK.read_seqretry(asked) || !dentry.hashed() {
836
+ return;
837
+ }
838
+ drop_hashed(&mut table, dentry);
788
839
  }
789
- self.unhash(dentry);
840
+ let kept = self.lru().pop(&(Arc::as_ptr(dentry) as usize));
841
+ drop(kept);
790
842
  if dentry.inode().is_some() {
791
843
  self.shrink_dcache_parent(dentry);
792
844
  }
@@ -883,12 +935,12 @@ mod tests {
883
935
 
884
936
  use super::{Dentries, Dentry};
885
937
  use crate::filesystem::{
886
- FileOperations, FileType, Filesystem, FilesystemError, InodeOperations, Kstat, Lookup,
887
- Tmpfs,
938
+ FileOperations, FileType, Filesystem, InodeOperations, Kstat, Lookup, Tmpfs,
888
939
  };
889
940
  use crate::mount::{Access, Mount};
890
941
  use crate::vfs::kern_path::{kern_path, KernPath};
891
942
  use crate::vfs::{self, File, Finish, Identity, Inode, OpenHow, Path};
943
+ use crate::Errno;
892
944
 
893
945
  /// A root of `dentries` standing for a directory, as `d_make_root` makes one.
894
946
  fn make_dir_root(dentries: &Dentries) -> Arc<Dentry> {
@@ -923,17 +975,13 @@ mod tests {
923
975
  /// A name it recorded nothing for is looked up again, as a Ruby Filesystem's
924
976
  /// `revalidate` answers, so one it made is found where the make left it.
925
977
  impl super::DentryOperations for ByPath {
926
- fn revalidate(
927
- &self,
928
- _dir: &dyn InodeOperations,
929
- dentry: &Dentry,
930
- ) -> Result<bool, FilesystemError> {
978
+ fn revalidate(&self, _dir: &dyn InodeOperations, dentry: &Dentry) -> Result<bool, Errno> {
931
979
  Ok(dentry.inode().is_some())
932
980
  }
933
981
  }
934
982
 
935
983
  impl crate::vfs::FileSystemType for ByPath {
936
- fn fill_super(self: Arc<Self>, sb: &mut Filesystem) -> Result<(), FilesystemError> {
984
+ fn fill_super(self: Arc<Self>, sb: &mut Filesystem) -> Result<(), Errno> {
937
985
  sb.set_default_d_op(self.clone());
938
986
  sb.d_make_root(Inode::new(&Kstat::new(FileType::Dir, 0), self));
939
987
  Ok(())
@@ -941,11 +989,11 @@ mod tests {
941
989
  }
942
990
 
943
991
  impl InodeOperations for ByPath {
944
- fn getattr(&self, dentry: &Dentry) -> Result<Kstat, FilesystemError> {
992
+ fn getattr(&self, dentry: &Dentry) -> Result<Kstat, Errno> {
945
993
  self.root.vfs_lstat(&at(dentry))
946
994
  }
947
995
 
948
- fn lookup(&self, dentry: &Dentry) -> Result<Lookup, FilesystemError> {
996
+ fn lookup(&self, dentry: &Dentry) -> Result<Lookup, Errno> {
949
997
  match self.root.vfs_lstat(&at(dentry)) {
950
998
  Ok(found) => Ok(Lookup::Found(Inode::new(
951
999
  &found,
@@ -953,23 +1001,19 @@ mod tests {
953
1001
  root: self.root.clone(),
954
1002
  }),
955
1003
  ))),
956
- Err(FilesystemError::NotFound) => Ok(Lookup::Absent),
1004
+ Err(Errno::NotFound) => Ok(Lookup::Absent),
957
1005
  Err(err) => Err(err),
958
1006
  }
959
1007
  }
960
1008
 
961
- fn open(
962
- &self,
963
- dentry: &Dentry,
964
- how: &OpenHow,
965
- ) -> Result<Box<dyn FileOperations>, FilesystemError> {
966
- if dentry.kind() == Ok(FileType::Dir) {
1009
+ fn open(&self, dentry: &Dentry, how: &OpenHow) -> Result<Box<dyn FileOperations>, Errno> {
1010
+ if dentry.file_type() == Ok(FileType::Dir) {
967
1011
  return Ok(Box::new(ByPathDir(self.root.clone())));
968
1012
  }
969
1013
  self.root.open(&at(dentry), how)
970
1014
  }
971
1015
 
972
- fn atomic_open(&self, dentry: &Dentry, how: &OpenHow) -> Result<Finish, FilesystemError> {
1016
+ fn atomic_open(&self, dentry: &Dentry, how: &OpenHow) -> Result<Finish, Errno> {
973
1017
  if dentry.in_lookup() {
974
1018
  let found = self.lookup(dentry)?;
975
1019
  if !how.create || !matches!(found, Lookup::Absent) {
@@ -986,29 +1030,29 @@ mod tests {
986
1030
  })
987
1031
  }
988
1032
 
989
- fn mkdir(&self, dentry: &Dentry) -> Result<(), FilesystemError> {
1033
+ fn mkdir(&self, dentry: &Dentry) -> Result<(), Errno> {
990
1034
  self.root.vfs_mkdir(&at(dentry))
991
1035
  }
992
1036
 
993
- fn rmdir(&self, dentry: &Dentry) -> Result<(), FilesystemError> {
1037
+ fn rmdir(&self, dentry: &Dentry) -> Result<(), Errno> {
994
1038
  self.root.vfs_rmdir(&at(dentry))
995
1039
  }
996
1040
 
997
- fn unlink(&self, dentry: &Dentry) -> Result<(), FilesystemError> {
1041
+ fn unlink(&self, dentry: &Dentry) -> Result<(), Errno> {
998
1042
  self.root.vfs_unlink(&at(dentry))
999
1043
  }
1000
1044
 
1001
1045
  fn rename(
1002
1046
  &self,
1003
- from: &Dentry,
1004
- to_dir: &dyn InodeOperations,
1005
- to: &Dentry,
1006
- _flag: Option<crate::vfs::RenameFlag>,
1007
- ) -> Result<(), FilesystemError> {
1008
- (to_dir as &dyn Any)
1047
+ old: &Dentry,
1048
+ new_dir: &dyn InodeOperations,
1049
+ new: &Dentry,
1050
+ _flags: Option<crate::vfs::RenameFlag>,
1051
+ ) -> Result<(), Errno> {
1052
+ (new_dir as &dyn Any)
1009
1053
  .downcast_ref::<Self>()
1010
- .ok_or(FilesystemError::CrossesDevices)?;
1011
- self.root.rename(&at(from), &self.root, &at(to))
1054
+ .ok_or(Errno::CrossesDevices)?;
1055
+ self.root.rename(&at(old), &self.root, &at(new))
1012
1056
  }
1013
1057
  }
1014
1058
 
@@ -1020,19 +1064,19 @@ mod tests {
1020
1064
  &mut self,
1021
1065
  dentry: &Dentry,
1022
1066
  ctx: &mut vfs::DirContext<'_>,
1023
- ) -> Result<(), FilesystemError> {
1067
+ ) -> Result<(), Errno> {
1024
1068
  let entries = match at(dentry).as_str() {
1025
1069
  "" => self.0.iterate_dir(),
1026
1070
  at => self.0.open_dir(at)?.iterate_dir(),
1027
1071
  }?;
1028
- crate::filesystem::Rdir::default().iterate(dentry, ctx, || Ok(entries))
1072
+ crate::filesystem::Rdir::default().iterate_shared(dentry, ctx, || Ok(entries))
1029
1073
  }
1030
1074
  }
1031
1075
 
1032
1076
  fn by_path(tmpfs: &Arc<Tmpfs>) -> Arc<Filesystem> {
1033
- Filesystem::new(Arc::new(ByPath {
1077
+ Filesystem::new(ByPath {
1034
1078
  root: kern_path(tmpfs.clone()),
1035
- }))
1079
+ })
1036
1080
  .expect("the instance must stand")
1037
1081
  }
1038
1082
 
@@ -1148,9 +1192,9 @@ mod tests {
1148
1192
  kern_path(tmpfs.clone()).vfs_lstat("dir/made").err()
1149
1193
  ),
1150
1194
  (
1151
- Err(FilesystemError::NotFound),
1152
- Err(FilesystemError::NotFound),
1153
- Some(FilesystemError::NotFound)
1195
+ Err(Errno::NotFound),
1196
+ Err(Errno::NotFound),
1197
+ Some(Errno::NotFound)
1154
1198
  ),
1155
1199
  "vfs::filename_mkdirat and File::iterate_dir through a directory vfs::filename_rmdir removed, over \
1156
1200
  a Filesystem answering by path, must each answer NotFound, as Linux asks \
@@ -1171,7 +1215,7 @@ mod tests {
1171
1215
  .expect("another directory must be made");
1172
1216
  assert_eq!(
1173
1217
  vfs::filename_mkdirat(&Arc::default(), &dir, "made"),
1174
- Err(FilesystemError::NotFound),
1218
+ Err(Errno::NotFound),
1175
1219
  "vfs::filename_mkdirat through a directory opened beneath one Mount, once vfs::filename_rmdir \
1176
1220
  removed it beneath another Mount of the same Filesystem, must answer NotFound"
1177
1221
  );
@@ -1222,7 +1266,17 @@ mod tests {
1222
1266
  "leaf",
1223
1267
  ));
1224
1268
  let beside = kept(negative(&dentries, &root, "other"));
1225
- dentries.invalidate(&dir);
1269
+ // The rename lock is the process's, so another test's rename can
1270
+ // move it between the read and the invalidation, which then keeps
1271
+ // the name as a raced revalidation does; ask again until one ran
1272
+ // undisturbed.
1273
+ loop {
1274
+ let asked = super::RENAME_LOCK.read_seqbegin();
1275
+ dentries.invalidate(&dir, asked);
1276
+ if !super::RENAME_LOCK.read_seqretry(asked) {
1277
+ break;
1278
+ }
1279
+ }
1226
1280
  assert_eq!(
1227
1281
  (beneath.upgrade().is_some(), beside.upgrade().is_some()),
1228
1282
  (false, true),