Skip to content

Commit cde35d6

Browse files
authored
Revert "support mkdir (#8)" (#9)
This reverts commit 8a380ac.
1 parent 8a380ac commit cde35d6

17 files changed

+230
-409
lines changed

.github/pull_request_template.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 0 additions & 45 deletions
This file was deleted.

Cargo.lock

Lines changed: 37 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
fuser = "0.15.1"
7+
fuse = "0.3.1"
88
bincode = "1.3.3"
99
bitvec = "1"
1010
serde = { version = "1", features = ["derive"] }
11+
time = "0.1"
1112
libc = "0.2.169"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
run:
2-
- sudo fusermount -u /tmp/tiny > /dev/null 2>&1
2+
sudo fusermount -u /tmp/tiny > /dev/null 2>&1
33
cargo run

README.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TinyFS is a little filesystem with no big plans.
99

1010
## Running
1111

12-
1. To start **tinyFS** run `make run` in this project's root dir
12+
1. To start **tinyFS** run `cargo run` in this project's root dir
1313
2. To interact with tinyFS, open another terminal and perform file operations on `/tmp/tiny` ie `stat /tmp/tiny`
1414

1515
## Resources
@@ -18,13 +18,16 @@ TinyFS is a little filesystem with no big plans.
1818
- [To FUSE or Not To Fuse](https://libfuse.github.io/doxygen/fast17-vangoor.pdf)
1919
- [Fuse Filesystems](https://zsiciarz.github.io/24daysofrust/book/vol1/day15.html)
2020

21-
## Supported
22-
23-
- [x] stat
24-
- [x] ls
25-
- [x] mkdir
26-
- [ ] rmdir
27-
- [ ] create
28-
- [ ] read
29-
- [ ] write
30-
- [ ] unlink
21+
## Design Docs
22+
23+
- [tinyfs intro](./design/tinyfs.md)
24+
- [format disk](./design/mkfs.md)
25+
- [initialize filesystem](./design/fs_init.md)
26+
- [stat](./design/stat.md)
27+
- [ls](./design/ls.md)
28+
- [mkdir]() Not Implemented
29+
- [rmdir]() Not Implemented
30+
- [create]() Not Implemented
31+
- [read]() Not Implemented
32+
- [write]() Not Implemented
33+
- [unlink]() Not Implemented

design/ls.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
## ls
2-
3-
## Goals
4-
5-
## Non-Goals
6-
7-
## Design

design/mkdir.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/main.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ fn main() {
1313

1414
let mount_path = "/tmp/tiny";
1515

16-
fuser::mount2(TinyFS { disk: load_disk(path) }, &mount_path, &[]).expect("expected filesytem to mount");
16+
fuse::mount(
17+
TinyFS {
18+
disk: load_disk(path),
19+
},
20+
&mount_path,
21+
&[],
22+
)
23+
.expect("expected filesytem to mount");
1724
}
1825

1926
fn load_disk(path: &Path) -> Disk {

src/mkfs.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ pub fn make(path: &str) {
2020
.expect("superblock to have been serialized");
2121

2222
let mut bitmap = Bitmap::new();
23-
bitmap.save_to(&disk).expect("bitmap to have been serialized");
23+
bitmap
24+
.save_to(&disk)
25+
.expect("bitmap to have been serialized");
2426

2527
buf.flush().expect("buffer to have been flushed");
26-
disk.set_len(64 * BLOCK_SIZE as u64).expect("to have set file size");
28+
disk.set_len(64 * BLOCK_SIZE as u64)
29+
.expect("to have set file size");
2730
}

0 commit comments

Comments
 (0)