Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6

1 files changed, 2 insertions, 2 deletions

diff --git a/defs.h b/defs.h
index 23b1019..560b19a 100644
--- a/defs.h
+++ b/defs.h
@@ -81,8 +81,8 @@ void            microdelay(int);
 // log.c
 void            initlog(void);
 void            log_write(struct buf*);
-void            begin_trans();
-void            commit_trans();
+void            begin_op();
+void            end_op();
 
 // mp.c
 extern int      ismp;