8 files changed, 9 insertions, 9 deletions
diff --git a/src/user/app/init/driver/initctl.c b/src/user/app/init/driver/initctl.c
index 7f5fc20..b9fe1c9 100644
--- a/src/user/app/init/driver/initctl.c
+++ b/src/user/app/init/driver/initctl.c
@@ -7,7 +7,7 @@
 #include <user/lib/compat.h>
 
 void initctl_drv(handle_t killswitch) {
-	struct fs_wait_response res;
+	struct ufs_request res;
 	char buf[64];
 	const size_t buflen = sizeof buf;
 	while (!c0_fs_wait(buf, buflen, &res)) {
diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c
index 0d344ed..5e9aeac 100644
--- a/src/user/app/init/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -52,7 +52,7 @@ static void parse_scancode(uint8_t s) {
 
 static void main_loop(void) {
 	static char buf[512];
-	struct fs_wait_response res;
+	struct ufs_request res;
 	int ret;
 	while (!c0_fs_wait(buf, sizeof buf, &res)) {
 		switch (res.op) {
diff --git a/src/user/app/login/login.c b/src/user/app/login/login.c
index 70de5b3..15276d4 100644
--- a/src/user/app/login/login.c
+++ b/src/user/app/login/login.c
@@ -34,7 +34,7 @@ bool segcmp(const char *path, int idx, const char *s2) {
 }
 
 static void drv(const char *user) {
-	struct fs_wait_response res;
+	struct ufs_request res;
 	char *buf = malloc(PATH_MAX);
 	while (!c0_fs_wait(buf, PATH_MAX, &res)) {
 		switch (res.op) {
diff --git a/src/user/app/netstack/fs.c b/src/user/app/netstack/fs.c
index 91e75ef..d8faadf 100644
--- a/src/user/app/netstack/fs.c
+++ b/src/user/app/netstack/fs.c
@@ -239,7 +239,7 @@ void fs_thread(void *arg) { (void)arg;
 	const size_t buflen = 4096;
 	char *buf = malloc(buflen);
 	for (;;) {
-		struct fs_wait_response res;
+		struct ufs_request res;
 		handle_t reqh = _syscall_fs_wait(buf, buflen, &res);
 		if (reqh < 0) break;
 		struct handle *h = res.id;
diff --git a/src/user/app/tests/kernel/fs.c b/src/user/app/tests/kernel/fs.c
index d11775a..65e349c 100644
--- a/src/user/app/tests/kernel/fs.c
+++ b/src/user/app/tests/kernel/fs.c
@@ -6,7 +6,7 @@ static void test_unfinished_req(void) {
 	handle_t h;
 	if (_syscall_fork(FORK_NEWFS, &h)) {
 		// TODO make a similar test with all 0s passed to fs_wait
-		struct fs_wait_response res;
+		struct ufs_request res;
 		_syscall_fs_wait(NULL, 0, &res);
 		// TODO second fs_wait
 		exit(0);
diff --git a/src/user/app/tests/kernel/path.c b/src/user/app/tests/kernel/path.c
index ddaf692..fd6eeec 100644
--- a/src/user/app/tests/kernel/path.c
+++ b/src/user/app/tests/kernel/path.c
@@ -66,7 +66,7 @@ static void test_path_simplify(void) {
 static void mount_resolve_drv(const char *path) {
 	if (fork2_n_mount(path)) return;
 
-	struct fs_wait_response res;
+	struct ufs_request res;
 	while (!c0_fs_wait(NULL, 0, &res)) {
 		// TODO does the first argument of c0_fs_respond need to be non-const?
 		c0_fs_respond((void*)path, strlen(path), 0);
diff --git a/src/user/app/tmpfs/tmpfs.c b/src/user/app/tmpfs/tmpfs.c
index 0d3fe36..7614d92 100644
--- a/src/user/app/tmpfs/tmpfs.c
+++ b/src/user/app/tmpfs/tmpfs.c
@@ -37,7 +37,7 @@ static struct node *lookup(struct node *parent, const char *path, size_t len) {
 	return NULL;
 }
 
-static struct node *tmpfs_open(const char *path, struct fs_wait_response *res) {
+static struct node *tmpfs_open(const char *path, struct ufs_request *res) {
 	/* *path is not null terminated! */
 	struct node *node = &special_root;
 	if (res->len == 0) return NULL;
@@ -103,7 +103,7 @@ static long remove_node(struct node *node) {
 int main(void) {
 	const size_t buflen = 4096;
 	char *buf = malloc(buflen);
-	struct fs_wait_response res;
+	struct ufs_request res;
 	struct node *ptr;
 	while (!c0_fs_wait(buf, buflen, &res)) {
 		switch (res.op) {
diff --git a/src/user/app/vterm/vterm.c b/src/user/app/vterm/vterm.c
index 102513d..bb60a34 100644
--- a/src/user/app/vterm/vterm.c
+++ b/src/user/app/vterm/vterm.c
@@ -38,7 +38,7 @@ int main(void) {
 	font_load("/init/font.psf");
 
 	static char buf[512];
-	struct fs_wait_response res;
+	struct ufs_request res;
 	while (!c0_fs_wait(buf, sizeof buf, &res)) {
 		switch (res.op) {
 			case VFSOP_OPEN: