mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfs: rewrite vfs_link

Browse Source
This commit is contained in:
Matheus
2024-08-26 23:02:06 -03:00
parent 76c74cfca1
commit 8f6bc6c4c1
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/fs/vfs.c
+31 -22
View File
@@ -420,41 +420,50 @@ int vfs_read(vnode_t *node, void *buffer, size_t size, uintmax_t offset, size_t
// in both cases, linkref and linkpath describe the location of where to create the new link // in both cases, linkref and linkpath describe the location of where to create the new link
int vfs_link(vnode_t *destref, char *destpath, vnode_t *linkref, char *linkpath, int type, vattr_t *attr) { int vfs_link(vnode_t *destref, char *destpath, vnode_t *linkref, char *linkpath, int type, vattr_t *attr) {
__assert(type == V_TYPE_LINK || type == V_TYPE_REGULAR); __assert(type == V_TYPE_LINK || type == V_TYPE_REGULAR);
char *component = alloc(strlen(linkpath) + 1);
vnode_t *parent = NULL;
int err = vfs_lookup(&parent, linkref, linkpath, component, VFS_LOOKUP_PARENT);
if (err)
goto cleanup;
err = VOP_ACCESS(parent, V_ACCESS_WRITE, getcred()); int err;
if (err) { vnode_t *targetnode = NULL;
// locked by vfs_lookup if (type == V_TYPE_REGULAR) {
VOP_UNLOCK(parent); targetnode = NULL;
err = vfs_lookup(&targetnode, destref, destpath, NULL, 0);
if (err)
return err;
}
char *component = alloc(strlen(linkpath) + 1);
if (component == NULL) {
err = ENOMEM;
goto cleanup; goto cleanup;
} }
// TODO rewrite this as it can deadlock as a directory is locked vnode_t *parent = NULL;
err = vfs_lookup(&parent, linkref, linkpath, component, VFS_LOOKUP_PARENT);
if (err)
goto cleanup_component;
err = VOP_ACCESS(parent, V_ACCESS_WRITE, getcred());
if (err)
goto cleanup_parent;
if (type == V_TYPE_REGULAR) { if (type == V_TYPE_REGULAR) {
vnode_t *targetnode = NULL;
err = vfs_lookup(&targetnode, destref, destpath, NULL, 0);
if (err) {
// locked by vfs_lookup
VOP_UNLOCK(parent);
goto cleanup;
}
err = VOP_LINK(targetnode, parent, component, getcred()); err = VOP_LINK(targetnode, parent, component, getcred());
// locked by vfs_lookup
VOP_UNLOCK(targetnode);
VOP_RELEASE(targetnode);
} else { } else {
err = VOP_SYMLINK(parent, component, attr, destpath, getcred()); err = VOP_SYMLINK(parent, component, attr, destpath, getcred());
} }
// locked by vfs_lookup cleanup_parent:
VOP_UNLOCK(parent); VOP_UNLOCK(parent);
cleanup:
VOP_RELEASE(parent); VOP_RELEASE(parent);
cleanup_component:
free(component); free(component);
cleanup:
if (type == V_TYPE_REGULAR) {
VOP_UNLOCK(targetnode);
VOP_RELEASE(targetnode);
}
return err; return err;
} }