diff options
| author | cinap_lenrek <cinap_lenrek@localhost> | 2011-08-19 05:20:42 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@localhost> | 2011-08-19 05:20:42 +0200 |
| commit | a4d2297e96741f5a90b61ed061f47e32ab907d73 (patch) | |
| tree | deacbb51e124cb5f650e3b714d334eb357bfea52 /sys/src/cmd/nusb/disk/disk.c | |
| parent | d25b95f4f26d57bf06a2d0f00a0872f715919c21 (diff) | |
nusb/disk: small clenups
Diffstat (limited to 'sys/src/cmd/nusb/disk/disk.c')
| -rw-r--r-- | sys/src/cmd/nusb/disk/disk.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys/src/cmd/nusb/disk/disk.c b/sys/src/cmd/nusb/disk/disk.c index da1a11cdd..c38a32933 100644 --- a/sys/src/cmd/nusb/disk/disk.c +++ b/sys/src/cmd/nusb/disk/disk.c @@ -256,15 +256,6 @@ umsrecover(void) return 0; } -static void -umsfatal(void) -{ -// int i; - - devctl(dev, "detach"); -// for(i = 0; i < ums->maxlun; i++) -// usbfsdel(&ums->lun[i].fs); -} static int ispow2(uvlong ul) @@ -478,11 +469,9 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status) Fail: *status = STharderr; - if(ums->nerrs++ > 15){ - fprint(2, "disk: %s: too many errors: device detached\n", dev->dir); - umsfatal(); - }else - umsrecover(); + if(ums->nerrs++ > 15) + sysfatal("%s: too many errors", dev->dir); + umsrecover(); return -1; } @@ -700,7 +689,6 @@ dread(Req *req) data = req->ofcall.data; offset = req->ifcall.offset; - qlock(ums); switch(path){ case Qdir: dirread9p(req, dirgen, lun); @@ -776,7 +764,6 @@ dread(Req *req) respond(req, nil); break; } - qunlock(ums); } static void @@ -798,7 +785,6 @@ dwrite(Req *req) data = req->ifcall.data; offset = req->ifcall.offset; - qlock(ums); switch(path){ case Qctl: s = emallocz(count+1, 1); @@ -902,7 +888,6 @@ dwrite(Req *req) respond(req, nil); break; } - qunlock(ums); } int |