vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix warnings, increase size of fs

Browse source
This commit is contained in:
Jeremy Soller 2016-11-19 20:23:25 -07:00
parent 41811ad98d
commit 39419fb008
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -552,7 +552,7 @@ build/filesystem.bin: \
filesystem/bin/tar filesystem/bin/tar
-$(FUMOUNT) build/filesystem/ -$(FUMOUNT) build/filesystem/
rm -rf $@ build/filesystem/ rm -rf $@ build/filesystem/
echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 64 echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 128
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse --release cargo build --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse --release
schemes/redoxfs/target/release/redoxfs-fuse $@ build/filesystem/ & schemes/redoxfs/target/release/redoxfs-fuse $@ build/filesystem/ &

4
kernel/scheme/live.rs
View file

@ -2,13 +2,13 @@
use alloc::arc::Arc; use alloc::arc::Arc;
use collections::{BTreeMap, Vec}; use collections::{BTreeMap, Vec};
use core::{cmp, str}; use core::cmp;
use core::sync::atomic::{AtomicUsize, Ordering}; use core::sync::atomic::{AtomicUsize, Ordering};
use spin::RwLock; use spin::RwLock;
use syscall::data::Stat; use syscall::data::Stat;
use syscall::error::*; use syscall::error::*;
use syscall::flag::{MODE_DIR, MODE_FILE, SEEK_SET, SEEK_CUR, SEEK_END}; use syscall::flag::{MODE_FILE, SEEK_SET, SEEK_CUR, SEEK_END};
use syscall::scheme::Scheme; use syscall::scheme::Scheme;
static FILESYSTEM: &'static [u8] = include_bytes!("../../build/filesystem.bin"); static FILESYSTEM: &'static [u8] = include_bytes!("../../build/filesystem.bin");

2
kernel/scheme/mod.rs
View file

@ -135,7 +135,7 @@ impl SchemeList {
// Debug, Disk, Initfs and IRQ are only available in the root namespace. Pipe is special // Debug, Disk, Initfs and IRQ are only available in the root namespace. Pipe is special
self.insert(ns, Box::new(*b"debug"), |scheme_id| Arc::new(Box::new(DebugScheme::new(scheme_id)))).unwrap(); self.insert(ns, Box::new(*b"debug"), |scheme_id| Arc::new(Box::new(DebugScheme::new(scheme_id)))).unwrap();
self.insert(ns, Box::new(*b"disk"), |scheme_id| Arc::new(Box::new(self::live::DiskScheme::new()))).unwrap(); self.insert(ns, Box::new(*b"disk"), |_| Arc::new(Box::new(self::live::DiskScheme::new()))).unwrap();
self.insert(ns, Box::new(*b"initfs"), |_| Arc::new(Box::new(InitFsScheme::new()))).unwrap(); self.insert(ns, Box::new(*b"initfs"), |_| Arc::new(Box::new(InitFsScheme::new()))).unwrap();
self.insert(ns, Box::new(*b"irq"), |scheme_id| Arc::new(Box::new(IrqScheme::new(scheme_id)))).unwrap(); self.insert(ns, Box::new(*b"irq"), |scheme_id| Arc::new(Box::new(IrqScheme::new(scheme_id)))).unwrap();
self.insert(ns, Box::new(*b"pipe"), |scheme_id| Arc::new(Box::new(PipeScheme::new(scheme_id)))).unwrap(); self.insert(ns, Box::new(*b"pipe"), |scheme_id| Arc::new(Box::new(PipeScheme::new(scheme_id)))).unwrap();