The final curproc[cpu()] is now cp

diff --git a/fs.c b/fs.c
index c62ce6733fefc4e46c90d77444061f7980af6bc3..7c5e0ca19800c1b465621b5df19d820668ea858c 100644 (file)
--- 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);
   }