summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2014-08-28 16:13:58 -0400
committerRobert Morris <[email protected]>2014-08-28 16:13:58 -0400
commit8d618cab78c91e4936bade94e9dcbf8fb54fbb19 (patch)
tree06dc3e1ea0d4d695b25051e90c96c89cc31c3b48 /proc.c
parent12eeefc72dc31211c5f54ea64e21c8a5668f92d7 (diff)
parent2b2c1971fc2c3cc6fa1f2f3e7b507a3a35a0cbb8 (diff)
downloadxv6-labs-8d618cab78c91e4936bade94e9dcbf8fb54fbb19.tar.gz
xv6-labs-8d618cab78c91e4936bade94e9dcbf8fb54fbb19.tar.bz2
xv6-labs-8d618cab78c91e4936bade94e9dcbf8fb54fbb19.zip
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/proc.c b/proc.c
index db0e9c7..a642f5a 100644
--- a/proc.c
+++ b/proc.c
@@ -186,9 +186,9 @@ exit(void)
}
}
- begin_trans();
+ begin_op();
iput(proc->cwd);
- commit_trans();
+ end_op();
proc->cwd = 0;
acquire(&ptable.lock);