Message types for VFS inhibread

Change-Id: I4ce20a4566033593e4784fd278d7ff7fda16dd9d

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index 5279e16ced9f9146a7dc1b30973703af50fa9730..2835ce438ccc8313ff99cb1fcbab8d2f55cc2789 100644 (file)
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -207,6 +207,13 @@ typedef struct {
 } mess_fs_vfs_getdents;
 _ASSERT_MSG_SIZE(mess_fs_vfs_getdents);
 
+typedef struct {
+       ino_t inode;
+
+       uint8_t data[48];
+} mess_vfs_fs_inhibread;
+_ASSERT_MSG_SIZE(mess_vfs_fs_inhibread);
+
 typedef struct {
        ino_t inode;
        ino_t dir_ino;
@@ -460,6 +467,7 @@ typedef struct {
        mess_vfs_fs_ftrunc m_vfs_fs_ftrunc;
        mess_vfs_fs_getdents m_vfs_fs_getdents;
        mess_fs_vfs_getdents m_fs_vfs_getdents;
+       mess_vfs_fs_inhibread m_vfs_fs_inhibread;
        mess_vfs_fs_link m_vfs_fs_link;
        mess_vfs_fs_lookup m_vfs_fs_lookup;
        mess_fs_vfs_lookup m_fs_vfs_lookup;

diff --git a/servers/ext2/open.c b/servers/ext2/open.c
index a8a74f7b0b86cd7046f8f408653a7cfd8f4eac31..2435f5355cad58c1aa093968827c394e729535fe 100644 (file)
--- a/servers/ext2/open.c
+++ b/servers/ext2/open.c
@@ -355,7 +355,7 @@ int fs_inhibread()
 {
   struct inode *rip;
 
-  if((rip = find_inode(fs_dev, (pino_t) fs_m_in.REQ_INODE_NR)) == NULL)
+  if((rip = find_inode(fs_dev, fs_m_in.m_vfs_fs_inhibread.inode)) == NULL)
          return(EINVAL);
 
   /* inhibit read ahead */

diff --git a/servers/mfs/open.c b/servers/mfs/open.c
index d41eef0db092128d8ac0865c2787c7d8fa087ec1..3f780cf48c7f99f69bdaa88cfc78c35c9879ae47 100644 (file)
--- a/servers/mfs/open.c
+++ b/servers/mfs/open.c
@@ -328,7 +328,7 @@ int fs_inhibread()
 {
   struct inode *rip;
   
-  if((rip = find_inode(fs_dev, (pino_t) fs_m_in.REQ_INODE_NR)) == NULL)
+  if((rip = find_inode(fs_dev, fs_m_in.m_vfs_fs_inhibread.inode)) == NULL)
          return(EINVAL);
 
   /* inhibit read ahead */

diff --git a/servers/vfs/request.c b/servers/vfs/request.c
index 25a8d38b920cf18f94dabed7f6c093fbaa36b4d4..234c916bd4d4c5e26f6a7956dc7a52fe506aed5c 100644 (file)
--- a/servers/vfs/request.c
+++ b/servers/vfs/request.c
@@ -373,7 +373,7 @@ int req_inhibread(endpoint_t fs_e, ino_t inode_nr)
 
   /* Fill in request message */
   m.m_type = REQ_INHIBREAD;
-  m.REQ_INODE_NR = (pino_t) inode_nr;
+  m.m_vfs_fs_inhibread.inode = inode_nr;
 
   /* Send/rec request */
   return fs_sendrec(fs_e, &m);