diff options
author | dzwdz | 2022-08-08 00:45:46 +0200 |
---|---|---|
committer | dzwdz | 2022-08-08 00:45:46 +0200 |
commit | b99d66ce12b4a1a0dd452d8a38006eede0c05cf2 (patch) | |
tree | 386aeeda170b8e8ed94dadeb0749a5c441995936 /src/kernel/vfs | |
parent | b0addbe14d2353e9c33f7f4d8a0b4ba8b24b2bd9 (diff) |
kernel/backend: remove the kern.ready() method
Diffstat (limited to 'src/kernel/vfs')
-rw-r--r-- | src/kernel/vfs/request.c | 10 | ||||
-rw-r--r-- | src/kernel/vfs/request.h | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/kernel/vfs/request.c b/src/kernel/vfs/request.c index 6883faa..82f4731 100644 --- a/src/kernel/vfs/request.c +++ b/src/kernel/vfs/request.c @@ -86,17 +86,9 @@ void vfsreq_finish(struct vfs_request *req, char __user *stored, long ret, void vfs_backend_tryaccept(struct vfs_backend *backend) { struct vfs_request *req = backend->queue; if (!req) return; - - /* ensure backend is ready to accept request */ - if (backend->is_user) { - if (!backend->user.handler) return; - } else { - assert(backend->kern.ready); - if (!backend->kern.ready(backend)) return; - } + if (backend->is_user && !backend->user.handler) return; backend->queue = req->queue_next; - if (backend->is_user) { vfs_backend_user_accept(req); } else { diff --git a/src/kernel/vfs/request.h b/src/kernel/vfs/request.h index ee33623..7c991f4 100644 --- a/src/kernel/vfs/request.h +++ b/src/kernel/vfs/request.h @@ -25,7 +25,6 @@ struct vfs_backend { struct process *handler; } user; struct { - bool (*ready)(struct vfs_backend *); void (*accept)(struct vfs_request *); } kern; }; @@ -77,9 +76,9 @@ void vfs_backend_user_accept(struct vfs_request *req); void vfs_backend_refdown(struct vfs_backend *); -#define BACKEND_KERN(ready, accept) ((struct vfs_backend){\ +#define BACKEND_KERN(accept) ((struct vfs_backend){\ .is_user = false, \ .heap = false, \ .potential_handlers = 1, \ .refcount = 1, \ - .kern = {ready, accept}}) + .kern.accept = accept}) |