Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

. expanded grant manipulation interface to more direct

Browse Source 
manipulation
. made fs allocate a grant for every ioctl, even if no data
  is being copied, in order to disambiguate concurrent ioctls
  on the same minor
This commit is contained in:
Ben Gras
2006-06-26 16:08:42 +00:00
parent 2f50f92eb3
commit a587273c56
3 changed files with 132 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
servers/fs/device.c
View File

@@ -178,14 +178,6 @@ off_t *pos;
int m, j;
iovec_t *v;
/* Is this device driver (identified by major number)
* ready to accept *_S commands?
*/
#if 0
if(major(dev) == 7) /* major number of inet. */
return 0; /* inet is not safe-capable. */
#endif
/* Number of grants allocated in vector I/O. */
*vec_grants = 0;
@@ -239,13 +231,15 @@ off_t *pos;
if(_MINIX_IOCTL_IOR(m_in.REQUEST)) access |= CPF_WRITE;
if(_MINIX_IOCTL_IOW(m_in.REQUEST)) access |= CPF_READ;
size = _MINIX_IOCTL_SIZE(m_in.REQUEST);
if(access && size > 0) {
if((*gid=cpf_grant_magic(driver, *io_ept,
(vir_bytes) buf, size, access)) < 0) {
panic(__FILE__,
"cpf_grant_magic failed (ioctl)\n",
NO_NUM);
}
/* Do this even if no I/O happens with the ioctl, in
* order to disambiguate requests with DEV_IOCTL_S.
*/
if((*gid=cpf_grant_magic(driver, *io_ept,
(vir_bytes) buf, size, access)) < 0) {
panic(__FILE__,
"cpf_grant_magic failed (ioctl)\n",
NO_NUM);
}
}