From 211ff0c67ea6737853cf932313cf4e27cc15f55c Mon Sep 17 00:00:00 2001 From: rtm Date: Sun, 13 Aug 2006 12:22:44 +0000 Subject: namei returns locked parent dir inode for create / unlink don't hold fd table lock across idecref() (latter does block i/o) idecref calls iput() in case last ref -> freeing inode dir size is 512 * # blocks, so readi/writei &c work unlink deletes dirent even if ip->nlink > 0 --- syscall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'syscall.c') diff --git a/syscall.c b/syscall.c index 4505c89..71a7013 100644 --- a/syscall.c +++ b/syscall.c @@ -228,7 +228,7 @@ sys_open(void) return -1; if((l = checkstring(arg0)) < 0) return -1; - if((ip = namei(cp->mem + arg0, 0)) == 0) { + if((ip = namei(cp->mem + arg0, NAMEI_LOOKUP, 0)) == 0) { if (arg1 & O_CREATE) { if (l >= DIRSIZ) return -1; @@ -356,7 +356,7 @@ sys_exec(void) return -1; if(checkstring(arg0) < 0) return -1; - ip = namei(cp->mem + arg0, 0); + ip = namei(cp->mem + arg0, NAMEI_LOOKUP, 0); if(ip == 0) return -1; @@ -494,7 +494,7 @@ sys_block(void) ip->type, ip->nlink, ip->size, ip->addrs[0]); iput(ip); - ip = namei(".././//./../usertests", 0); + ip = namei(".././//./../usertests", NAMEI_LOOKUP, 0); if(ip){ cprintf("namei(usertests): %d %d %d %d %d %d %d %d\n", ip->dev, ip->inum, ip->count, ip->busy, -- cgit v1.2.3