oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug where safe conversion doesn't happen after 1st time in loop

Browse Source
This commit is contained in:
Ben Gras 2006-06-28 10:03:18 +00:00
parent 6b1f8de38a
commit f9fb0ff546
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/fs/device.c
View File

@ -297,6 +297,7 @@ int bytes; /* how many bytes to transfer */
for (;;) for (;;)
{ {
int op_used;
static cp_grant_id_t gids[NR_IOREQS]; static cp_grant_id_t gids[NR_IOREQS];
cp_grant_id_t gid = GRANT_INVALID; cp_grant_id_t gid = GRANT_INVALID;
int vec_grants; int vec_grants;
@ -312,12 +313,14 @@ int bytes; /* how many bytes to transfer */
m.ADDRESS = buf; m.ADDRESS = buf;
/* Convert parameters to 'safe mode'. */ /* Convert parameters to 'safe mode'. */
op_used = op;
safe = safe_io_conversion(dp->dmap_driver, dev, &gid, safe = safe_io_conversion(dp->dmap_driver, dev, &gid,
&op, gids, NR_IOREQS, &m.IO_ENDPT, buf, &vec_grants, bytes, &pos); &op_used, gids, NR_IOREQS, &m.IO_ENDPT, buf,
&vec_grants, bytes, &pos);
/* Set up rest of the message. */ /* Set up rest of the message. */
if(safe) m.IO_GRANT = (char *) gid; if(safe) m.IO_GRANT = (char *) gid;
m.m_type = op; m.m_type = op_used;
m.DEVICE = (dev >> MINOR) & BYTE; m.DEVICE = (dev >> MINOR) & BYTE;
m.POSITION = pos; m.POSITION = pos;
m.COUNT = bytes; m.COUNT = bytes;