From 6bd204e1a34a8bc2f41c0a76277737e42e91d801 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 8 Feb 2026 17:23:50 +0100 Subject: [PATCH] Remove always true supports_on_close field --- src/scheme/mod.rs | 2 +- src/scheme/user.rs | 24 +----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/scheme/mod.rs b/src/scheme/mod.rs index b0d082abf1..4aef4d302e 100644 --- a/src/scheme/mod.rs +++ b/src/scheme/mod.rs @@ -217,7 +217,7 @@ impl SchemeList { }; let root_id = SchemeId(SCHEME_LIST_ID.load(Ordering::Relaxed)); - let inner = Arc::new(UserInner::new(root_id, id, true, context)); + let inner = Arc::new(UserInner::new(root_id, id, context)); let new_scheme = Handle::Scheme(KernelSchemes::User(UserScheme::new(inner))); assert!(handles.insert(id, new_scheme).is_none()); Ok(id) diff --git a/src/scheme/user.rs b/src/scheme/user.rs index 97cdcffb82..7f1a3c0f63 100644 --- a/src/scheme/user.rs +++ b/src/scheme/user.rs @@ -45,7 +45,6 @@ use super::{CallerCtx, FileHandle, KernelScheme, OpenResult}; pub struct UserInner { root_id: SchemeId, pub scheme_id: SchemeId, - supports_on_close: bool, context: Weak, todo: WaitQueue, @@ -151,15 +150,9 @@ impl ParsedCqe { } impl UserInner { - pub fn new( - root_id: SchemeId, - scheme_id: SchemeId, - new_close: bool, - context: Weak, - ) -> UserInner { + pub fn new(root_id: SchemeId, scheme_id: SchemeId, context: Weak) -> UserInner { UserInner { root_id, - supports_on_close: new_close, scheme_id, context, todo: WaitQueue::new(), @@ -1571,21 +1564,6 @@ impl KernelScheme for UserScheme { } fn close(&self, id: usize, token: &mut CleanLockToken) -> Result<()> { - let ctx = { context::current().read(token.token()).caller_ctx() }; - if !self.inner.supports_on_close { - self.inner - .call( - ctx, - Vec::new(), - Opcode::Close, - [id], - &mut PageSpan::empty(), - token, - )? - .as_regular()?; - return Ok(()); - } - self.inner.todo.send( Sqe { opcode: Opcode::CloseMsg as u8,