summaryrefslogtreecommitdiff
path: root/fs.c
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-09 19:06:37 +0000
committerrsc <rsc>2007-08-09 19:06:37 +0000
commitbc0117033440edb34ef1c0f72c0ceac5a7ee6831 (patch)
tree7c247e23910b22659e3772e3f1fa4be3112759a2 /fs.c
parentab5c2dbb592fde4219fd3b2bf8d82e2299f6f9c9 (diff)
downloadxv6-labs-bc0117033440edb34ef1c0f72c0ceac5a7ee6831.tar.gz
xv6-labs-bc0117033440edb34ef1c0f72c0ceac5a7ee6831.tar.bz2
xv6-labs-bc0117033440edb34ef1c0f72c0ceac5a7ee6831.zip
The final curproc[cpu()] is now cp
Diffstat (limited to 'fs.c')
-rw-r--r--fs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs.c b/fs.c
index c62ce67..7c5e0ca 100644
--- a/fs.c
+++ b/fs.c
@@ -557,11 +557,10 @@ namei(char *path, int mode, uint *ret_off,
char **ret_last, struct inode **ret_ip)
{
struct inode *dp;
- struct proc *p = curproc[cpu()];
+ struct proc *cp = curproc[cpu()];
char *name;
int namelen;
- uint off, dev;
- uint inum;
+ uint off, dev, inum;
if(ret_off)
*ret_off = 0xffffffff;
@@ -573,7 +572,7 @@ namei(char *path, int mode, uint *ret_off,
if(*path == '/')
dp = iget(rootdev, 1);
else {
- dp = iincref(p->cwd);
+ dp = iincref(cp->cwd);
ilock(dp);
}