From bdf82a958a5231f406381fbfddf7852e1e086d40 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Mon, 6 Apr 2026 14:46:08 +0200 Subject: [PATCH] Use call instead of call_inner for fmap_inner --- src/scheme/user.rs | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/scheme/user.rs b/src/scheme/user.rs index 3d8a8d5db8..33aa4936a9 100644 --- a/src/scheme/user.rs +++ b/src/scheme/user.rs @@ -1044,33 +1044,26 @@ impl UserInner { return Err(Error::new(EBUSY)); } - let (pid, desc) = { + let (ctx, desc) = { let current_lock = context::current(); let mut current = current_lock.read(token.token()); let (context, mut token) = current.token_split(); let mut files = context.files.read(token.token()); let (files, mut token) = files.token_split(); let desc = files.find_by_scheme(self.scheme_id, file, &mut token)?; - (context.pid, desc.description) + (context.caller_ctx(), desc.description) }; - let response = self.call_inner( + let response = self.call( + ctx, Vec::new(), - Sqe { - opcode: Opcode::MmapPrep as u8, - sqe_flags: SqeFlags::empty(), - _rsvd: 0, - tag: self.next_id(token)?, - args: [ - file as u64, - unaligned_size as u64, - map.flags.bits() as u64, - map.offset as u64, - 0, - uid_gid_hack_merge(current_uid_gid(token)), - ], - caller: pid as u64, - }, + Opcode::MmapPrep, + [ + file as u64, + unaligned_size as u64, + map.flags.bits() as u64, + map.offset as u64, + ], &mut PageSpan::empty(), token, )?;