From 3b8b63bf133e855d942abb67de931ce08b7a4452 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Tue, 20 Sep 2022 23:35:33 +0200 Subject: shared: rename ufs_request to better fit its role in userland The old name could have suggested that it held a response to a request received by fs_wait. The new name is unfortunately very similar to the `struct vfs_request` already used internally in the kernel, but it's better at conveying that it contains a filesystem request yet to be handled. vfs_request - virtual filesystem request (a bad name in hindsight) ufs_request - user filesystem request --- src/user/bootstrap/tar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/user/bootstrap/tar.c') diff --git a/src/user/bootstrap/tar.c b/src/user/bootstrap/tar.c index 752c86e..2968995 100644 --- a/src/user/bootstrap/tar.c +++ b/src/user/bootstrap/tar.c @@ -14,7 +14,7 @@ static void *tar_open(const char *path, int len, void *base, size_t base_len); static char tar_type(void *meta); static void tar_dirbuild(struct dirbuild *db, const char *meta, void *base, size_t base_len); -static void tar_read(struct fs_wait_response *res, void *base, size_t base_len); +static void tar_read(struct ufs_request *res, void *base, size_t base_len); static int tar_size(void *sector); static int oct_parse(char *str, size_t len); @@ -24,7 +24,7 @@ static const char *root_fakemeta = ""; /* see comment in tar_open */ void tar_driver(void *base) { static char buf[BUF_SIZE]; - struct fs_wait_response res; + struct ufs_request res; void *ptr; while (!c0_fs_wait(buf, BUF_SIZE, &res)) { switch (res.op) { @@ -99,7 +99,7 @@ static void tar_dirbuild(struct dirbuild *db, const char *meta, void *base, size } } -static void tar_read(struct fs_wait_response *res, void *base, size_t base_len) { +static void tar_read(struct ufs_request *res, void *base, size_t base_len) { void *meta = (void*)res->id; static char buf[BUF_SIZE]; // TODO reuse a single buffer for both tar_driver and tar_read -- cgit v1.2.3