diff --git a/bootstrap/src/exec.rs b/bootstrap/src/exec.rs index 558752aebf..5c0ed91700 100644 --- a/bootstrap/src/exec.rs +++ b/bootstrap/src/exec.rs @@ -4,10 +4,10 @@ use alloc::vec::Vec; use core::ffi::CStr; use core::str::FromStr; +use syscall::CallFlags; use syscall::data::{GlobalSchemes, KernelSchemeInfo}; use syscall::flag::{O_CLOEXEC, O_RDONLY}; -use syscall::CallFlags; -use syscall::{Error, EINTR}; +use syscall::{EINTR, Error}; use redox_rt::proc::*; diff --git a/bootstrap/src/initfs.rs b/bootstrap/src/initfs.rs index 8196500c77..54b042169a 100644 --- a/bootstrap/src/initfs.rs +++ b/bootstrap/src/initfs.rs @@ -6,12 +6,13 @@ use core::str; use alloc::string::String; use hashbrown::HashMap; -use redox_initfs::{types::Timespec, InitFs, Inode, InodeDir, InodeKind, InodeStruct}; +use redox_initfs::{InitFs, Inode, InodeDir, InodeKind, InodeStruct, types::Timespec}; use redox_path::canonicalize_to_standard; -use redox_scheme::{scheme::SchemeSync, CallerCtx, OpenResult, RequestKind}; +use redox_scheme::{CallerCtx, OpenResult, RequestKind, scheme::SchemeSync}; use redox_scheme::{SignalBehavior, Socket}; +use syscall::PAGE_SIZE; use syscall::data::Stat; use syscall::dirent::DirEntry; use syscall::dirent::DirentBuf; @@ -19,7 +20,6 @@ use syscall::dirent::DirentKind; use syscall::error::*; use syscall::flag::*; use syscall::schemev2::NewFdFlags; -use syscall::PAGE_SIZE; use crate::KernelSchemeMap; diff --git a/bootstrap/src/procmgr.rs b/bootstrap/src/procmgr.rs index c240a15da0..f69c0a4115 100644 --- a/bootstrap/src/procmgr.rs +++ b/bootstrap/src/procmgr.rs @@ -2297,7 +2297,7 @@ impl<'a> ProcScheme<'a> { let rtq = target_proc.rtqs.get_mut(rtidx).unwrap(); // TODO(feat): configurable limit? - if rtq.len() > 32 { + if rtq.len() >= 32 { return SendResult::FullQ; }