From 3a5fa7ed9020eaf8ab843a16d26db7393b2ec072 Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Fri, 26 Aug 2011 10:08:29 -0400 Subject: Introduce and use sleeplocks instead of BUSY flags Remove I_BUSY, B_BUSY, and intrans defs and usages One spinlock per buf to avoid ugly loop in bget fix race in filewrite (don't update f->off after releasing lock) --- file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index f8a14ad..2a32c60 100644 --- a/file.c +++ b/file.c @@ -2,8 +2,8 @@ #include "defs.h" #include "param.h" #include "fs.h" -#include "file.h" #include "spinlock.h" +#include "file.h" struct devsw devsw[NDEV]; struct { @@ -133,7 +133,8 @@ filewrite(struct file *f, char *addr, int n) begin_trans(); ilock(f->ip); - r = writei(f->ip, addr + i, f->off, n1); + if ((r = writei(f->ip, addr + i, f->off, n1)) > 0) + f->off += r; iunlock(f->ip); commit_trans(); @@ -141,7 +142,6 @@ filewrite(struct file *f, char *addr, int n) break; if(r != n1) panic("short filewrite"); - f->off += r; i += r; } return i == n ? n : -1; -- cgit v1.2.3