64-bit RES_FILE_SIZE

Change-Id: Ia17b4b4722f87fb35142948b62d4a8392ded5f73

diff --git a/include/minix/vfsif.h b/include/minix/vfsif.h
index e2e4752cc566fff0e2b09c74b3eb073b5e254f1b..2044b55ff22b7b5c88af2ae3e3df574b0402a45e 100644 (file)
--- a/include/minix/vfsif.h
+++ b/include/minix/vfsif.h
@@ -42,8 +42,7 @@
 #define RES_DEV                        m9_ull1
 #define RES_GID                        m9_s1
 #define RES_INODE_NR           m9_l1
-#define RES_FILE_SIZE_HI       m9_l2
-#define RES_FILE_SIZE_LO       m9_l3
+#define RES_FILE_SIZE          m9_ull2
 #define RES_MODE               m9_s2
 #define RES_NBYTES             m9_l5
 #define RES_OFFSET             m9_s2

diff --git a/lib/libpuffs/mount.c b/lib/libpuffs/mount.c
index 5218b8b4f993be40725bcbe098bdfff1a7a93387..7b7da1cff5781b5935ab28a133609c8af8eb4343 100644 (file)
--- a/lib/libpuffs/mount.c
+++ b/lib/libpuffs/mount.c
@@ -30,7 +30,7 @@ int fs_readsuper(void)
   root_va = &global_pu->pu_pn_root->pn_va;
   fs_m_out.RES_INODE_NR = root_va->va_fileid;
   fs_m_out.RES_MODE = root_va->va_mode;
-  fs_m_out.RES_FILE_SIZE_LO = root_va->va_size;
+  fs_m_out.RES_FILE_SIZE = root_va->va_size;
   fs_m_out.RES_UID = root_va->va_uid;
   fs_m_out.RES_GID = root_va->va_gid;
   fs_m_out.RES_FLAGS = RES_NOFLAGS;

diff --git a/lib/libpuffs/open.c b/lib/libpuffs/open.c
index 2d6b4305da674e868a71ae087e8c9501c05e58a0..42994b72fae5498ccf0fa3364469147710d5f022 100644 (file)
--- a/lib/libpuffs/open.c
+++ b/lib/libpuffs/open.c
@@ -101,7 +101,7 @@ int fs_create(void)
   /* Reply message */
   fs_m_out.RES_INODE_NR = pn->pn_va.va_fileid;
   fs_m_out.RES_MODE = pn->pn_va.va_mode;
-  fs_m_out.RES_FILE_SIZE_LO = pn->pn_va.va_size;
+  fs_m_out.RES_FILE_SIZE = pn->pn_va.va_size;
 
   /* This values are needed for the execution */
   fs_m_out.RES_UID = pn->pn_va.va_uid;

diff --git a/lib/libpuffs/path.c b/lib/libpuffs/path.c
index c749289f28c66933b61583773b273b40f29f0431..40030a6b1d422928588d2024e7c7f84091acb708 100644 (file)
--- a/lib/libpuffs/path.c
+++ b/lib/libpuffs/path.c
@@ -108,7 +108,7 @@ int fs_lookup(void)
 
   fs_m_out.RES_INODE_NR                = pn->pn_va.va_fileid;
   fs_m_out.RES_MODE            = pn->pn_va.va_mode;
-  fs_m_out.RES_FILE_SIZE_LO    = pn->pn_va.va_size;
+  fs_m_out.RES_FILE_SIZE       = pn->pn_va.va_size;
   fs_m_out.RES_SYMLOOP         = symlinks;
   fs_m_out.RES_UID             = pn->pn_va.va_uid;
   fs_m_out.RES_GID             = pn->pn_va.va_gid;

diff --git a/lib/libsffs/link.c b/lib/libsffs/link.c
index 67716958cb29ccf1872c3103283297179d91a976..f42026113ea2c6b8f43608ab707da9ff305a84f8 100644 (file)
--- a/lib/libsffs/link.c
+++ b/lib/libsffs/link.c
@@ -117,8 +117,7 @@ int do_create(void)
 
   m_out.RES_INODE_NR = INODE_NR(ino);
   m_out.RES_MODE = get_mode(ino, attr.a_mode);
-  m_out.RES_FILE_SIZE_HI = ex64hi(attr.a_size);
-  m_out.RES_FILE_SIZE_LO = ex64lo(attr.a_size);
+  m_out.RES_FILE_SIZE = attr.a_size;
   m_out.RES_UID = sffs_params->p_uid;
   m_out.RES_GID = sffs_params->p_gid;
   m_out.RES_DEV = NO_DEV;

diff --git a/lib/libsffs/lookup.c b/lib/libsffs/lookup.c
index b3ef77f2527a036c863a1340cb26b01c247b07bf..9c27436dbe467b687e500ac9b9bc6c9adab4e148 100644 (file)
--- a/lib/libsffs/lookup.c
+++ b/lib/libsffs/lookup.c
@@ -331,8 +331,7 @@ int do_lookup(void)
 
   m_out.RES_INODE_NR = INODE_NR(cur_ino);
   m_out.RES_MODE = get_mode(cur_ino, attr.a_mode);
-  m_out.RES_FILE_SIZE_HI = ex64hi(attr.a_size);
-  m_out.RES_FILE_SIZE_LO = ex64lo(attr.a_size);
+  m_out.RES_FILE_SIZE = attr.a_size;
   m_out.RES_UID = sffs_params->p_uid;
   m_out.RES_GID = sffs_params->p_gid;
   m_out.RES_DEV = NO_DEV;

diff --git a/lib/libsffs/mount.c b/lib/libsffs/mount.c
index 3e2d753382d82dda48e6d4997b25ed76d7dba577..0d3c15afa04b2cd96b8b6cce78645d5b40ed2e30 100644 (file)
--- a/lib/libsffs/mount.c
+++ b/lib/libsffs/mount.c
@@ -57,8 +57,7 @@ int do_readsuper(void)
 
   m_out.RES_INODE_NR = INODE_NR(ino);
   m_out.RES_MODE = get_mode(ino, attr.a_mode);
-  m_out.RES_FILE_SIZE_HI = ex64hi(attr.a_size);
-  m_out.RES_FILE_SIZE_LO = ex64lo(attr.a_size);
+  m_out.RES_FILE_SIZE = attr.a_size;
   m_out.RES_UID = sffs_params->p_uid;
   m_out.RES_GID = sffs_params->p_gid;
   m_out.RES_DEV = NO_DEV;

diff --git a/lib/libvtreefs/mount.c b/lib/libvtreefs/mount.c
index dc6a8b7c833834c4ea22fd86424b512256002c87..f961e5e7ddeb21964944349e605bd0799a4b8ce9 100644 (file)
--- a/lib/libvtreefs/mount.c
+++ b/lib/libvtreefs/mount.c
@@ -29,8 +29,7 @@ int fs_readsuper(void)
        /* Return the root inode's properties. */
        fs_m_out.RES_INODE_NR = get_inode_number(root);
        fs_m_out.RES_MODE = root->i_stat.mode;
-       fs_m_out.RES_FILE_SIZE_HI = 0;
-       fs_m_out.RES_FILE_SIZE_LO = root->i_stat.size;
+       fs_m_out.RES_FILE_SIZE = root->i_stat.size;
        fs_m_out.RES_UID = root->i_stat.uid;
        fs_m_out.RES_GID = root->i_stat.gid;
        fs_m_out.RES_DEV = NO_DEV;

diff --git a/lib/libvtreefs/path.c b/lib/libvtreefs/path.c
index 55e468c19bc4fdef47500f9932ab917afe7817e2..9360ed78d28794f6ed97158beb1ec04397935b03 100644 (file)
--- a/lib/libvtreefs/path.c
+++ b/lib/libvtreefs/path.c
@@ -303,8 +303,7 @@ int fs_lookup(void)
        /* On success, leave the resulting file open and return its details. */
        fs_m_out.RES_INODE_NR = get_inode_number(cur_ino);
        fs_m_out.RES_MODE = cur_ino->i_stat.mode;
-       fs_m_out.RES_FILE_SIZE_HI = 0;
-       fs_m_out.RES_FILE_SIZE_LO = cur_ino->i_stat.size;
+       fs_m_out.RES_FILE_SIZE = cur_ino->i_stat.size;
        fs_m_out.RES_UID = cur_ino->i_stat.uid;
        fs_m_out.RES_GID = cur_ino->i_stat.gid;
        fs_m_out.RES_DEV = cur_ino->i_stat.dev;

diff --git a/servers/ext2/mount.c b/servers/ext2/mount.c
index c2d76ff1f48a04ee9bacca843b3e33680bbfe2c8..f9c13827f4e02b05e729aab6b7b77e68827b5712 100644 (file)
--- a/servers/ext2/mount.c
+++ b/servers/ext2/mount.c
@@ -155,7 +155,7 @@ int fs_readsuper()
   /* Root inode properties */
   fs_m_out.RES_INODE_NR = root_ip->i_num;
   fs_m_out.RES_MODE = root_ip->i_mode;
-  fs_m_out.RES_FILE_SIZE_LO = root_ip->i_size;
+  fs_m_out.RES_FILE_SIZE = root_ip->i_size;
   fs_m_out.RES_UID = root_ip->i_uid;
   fs_m_out.RES_GID = root_ip->i_gid;
   fs_m_out.RES_FLAGS = RES_HASPEEK;

diff --git a/servers/ext2/open.c b/servers/ext2/open.c
index dd8988889376a6f893ea71468af45a3dae833981..e5e4bf2e443b8939aa4027ff8a5e6690119922bf 100644 (file)
--- a/servers/ext2/open.c
+++ b/servers/ext2/open.c
@@ -63,7 +63,7 @@ int fs_create()
   /* Reply message */
   fs_m_out.RES_INODE_NR = rip->i_num;
   fs_m_out.RES_MODE = rip->i_mode;
-  fs_m_out.RES_FILE_SIZE_LO = rip->i_size;
+  fs_m_out.RES_FILE_SIZE = rip->i_size;
 
   /* This values are needed for the execution */
   fs_m_out.RES_UID = rip->i_uid;

diff --git a/servers/ext2/path.c b/servers/ext2/path.c
index 314c1d9f6fadcff60f61922223682a94f07f0a20..82c467e79108572cf733218915af8984594d0b0b 100644 (file)
--- a/servers/ext2/path.c
+++ b/servers/ext2/path.c
@@ -100,7 +100,7 @@ int fs_lookup()
 
   fs_m_out.RES_INODE_NR                = rip->i_num;
   fs_m_out.RES_MODE            = rip->i_mode;
-  fs_m_out.RES_FILE_SIZE_LO    = rip->i_size;
+  fs_m_out.RES_FILE_SIZE       = rip->i_size;
   fs_m_out.RES_SYMLOOP         = symlinks;
   fs_m_out.RES_UID             = rip->i_uid;
   fs_m_out.RES_GID             = rip->i_gid;

diff --git a/servers/iso9660fs/mount.c b/servers/iso9660fs/mount.c
index 443b71dac12e6234eeba69ed0291183a96ea8002..0de63297ba8a8c8e682af7c61752ac2397a4d700 100644 (file)
--- a/servers/iso9660fs/mount.c
+++ b/servers/iso9660fs/mount.c
@@ -48,7 +48,7 @@ int fs_readsuper() {
   /* Return some root inode properties */
   fs_m_out.RES_INODE_NR = ID_DIR_RECORD(v_pri.dir_rec_root);
   fs_m_out.RES_MODE = v_pri.dir_rec_root->d_mode;
-  fs_m_out.RES_FILE_SIZE_LO = v_pri.dir_rec_root->d_file_size;
+  fs_m_out.RES_FILE_SIZE = v_pri.dir_rec_root->d_file_size;
   fs_m_out.RES_UID = SYS_UID; /* Always root */
   fs_m_out.RES_GID = SYS_GID; /* operator */
   fs_m_out.RES_FLAGS = RES_NOFLAGS;

diff --git a/servers/iso9660fs/path.c b/servers/iso9660fs/path.c
index 865c5c77bd83e7708c6fca25c615119587d421a5..8ccc78c72d7bede5ccd8129de13d40dc3bde2e6e 100644 (file)
--- a/servers/iso9660fs/path.c
+++ b/servers/iso9660fs/path.c
@@ -60,7 +60,7 @@ int fs_lookup() {
 
   fs_m_out.RES_INODE_NR     = ID_DIR_RECORD(dir);
   fs_m_out.RES_MODE         = dir->d_mode;
-  fs_m_out.RES_FILE_SIZE_LO = dir->d_file_size; 
+  fs_m_out.RES_FILE_SIZE    = dir->d_file_size; 
   fs_m_out.RES_SYMLOOP      = 0;
   fs_m_out.RES_UID          = SYS_UID;         /* root */
   fs_m_out.RES_GID          = SYS_GID;         /* operator */

diff --git a/servers/mfs/mount.c b/servers/mfs/mount.c
index d4510bb060d9654badeb47ced5d99583e91e7e4a..14f7aac94f4bb3ad5a14b91e07385aaa730b7987 100644 (file)
--- a/servers/mfs/mount.c
+++ b/servers/mfs/mount.c
@@ -103,7 +103,7 @@ int fs_readsuper()
   /* Root inode properties */
   fs_m_out.RES_INODE_NR = root_ip->i_num;
   fs_m_out.RES_MODE = root_ip->i_mode;
-  fs_m_out.RES_FILE_SIZE_LO = root_ip->i_size;
+  fs_m_out.RES_FILE_SIZE = root_ip->i_size;
   fs_m_out.RES_UID = root_ip->i_uid;
   fs_m_out.RES_GID = root_ip->i_gid;
   fs_m_out.RES_FLAGS = RES_HASPEEK;

diff --git a/servers/mfs/open.c b/servers/mfs/open.c
index 6dc29842d81bc2b5d7d8a517af947ed24ade49e7..96ea1234bc7b235da33083e0bb5689f9cc3cd37e 100644 (file)
--- a/servers/mfs/open.c
+++ b/servers/mfs/open.c
@@ -54,7 +54,7 @@ int fs_create()
   /* Reply message */
   fs_m_out.RES_INODE_NR = rip->i_num;
   fs_m_out.RES_MODE = rip->i_mode;
-  fs_m_out.RES_FILE_SIZE_LO = rip->i_size;
+  fs_m_out.RES_FILE_SIZE = rip->i_size;
 
   /* These values are needed for the execution */
   fs_m_out.RES_UID = rip->i_uid;

diff --git a/servers/mfs/path.c b/servers/mfs/path.c
index 7676c07437a0435373799a448735ab8d2e8bc0d3..7c69f2a2683c0e1452a04ef4ac86446def0213a1 100644 (file)
--- a/servers/mfs/path.c
+++ b/servers/mfs/path.c
@@ -99,7 +99,7 @@ int fs_lookup()
 
   fs_m_out.RES_INODE_NR        = rip->i_num;
   fs_m_out.RES_MODE            = rip->i_mode;
-  fs_m_out.RES_FILE_SIZE_LO    = rip->i_size;
+  fs_m_out.RES_FILE_SIZE       = rip->i_size;
   fs_m_out.RES_SYMLOOP         = symlinks;
   fs_m_out.RES_UID             = rip->i_uid;
   fs_m_out.RES_GID             = rip->i_gid;

diff --git a/servers/pfs/open.c b/servers/pfs/open.c
index 4d8d202c30491807fae8a225c611b41d6341fad7..27273dab21a5cd5aabd79deda5eca6a07eb2eec2 100644 (file)
--- a/servers/pfs/open.c
+++ b/servers/pfs/open.c
@@ -44,7 +44,7 @@ int fs_newnode(message *fs_m_in, message *fs_m_out)
        /* Fill in the fields of the response message */
        fs_m_out->RES_INODE_NR = rip->i_num;
        fs_m_out->RES_MODE = rip->i_mode;
-       fs_m_out->RES_FILE_SIZE_LO = rip->i_size;
+       fs_m_out->RES_FILE_SIZE = rip->i_size;
        fs_m_out->RES_UID = rip->i_uid;
        fs_m_out->RES_GID = rip->i_gid;
        fs_m_out->RES_DEV = dev;

diff --git a/servers/vfs/request.c b/servers/vfs/request.c
index 81740c6f1d278032f1f43e0b0fbbf4790f6cb0d6..58a64061d270c3575b1747ef41f6e825a8e19881 100644 (file)
--- a/servers/vfs/request.c
+++ b/servers/vfs/request.c
@@ -188,11 +188,7 @@ int req_create(
   res->fs_e    = m.m_source;
   res->inode_nr        = (ino_t) m.RES_INODE_NR;
   res->fmode   = (mode_t) m.RES_MODE;
-  if (vmp->m_fs_flags & RES_64BIT) {
-       res->fsize = make64(m.RES_FILE_SIZE_LO, m.RES_FILE_SIZE_HI);
-  } else {
-       res->fsize = m.RES_FILE_SIZE_LO;
-  }
+  res->fsize    = m.RES_FILE_SIZE;
   res->uid     = (uid_t) m.RES_UID;
   res->gid     = (gid_t) m.RES_GID;
   res->dev     = NO_DEV;
@@ -463,11 +459,7 @@ int req_lookup(
   case OK:
        res->inode_nr = (ino_t) m.RES_INODE_NR;
        res->fmode = (mode_t) m.RES_MODE;
-       if (vmp->m_fs_flags & RES_64BIT) {
-               res->fsize = make64(m.RES_FILE_SIZE_LO, m.RES_FILE_SIZE_HI);
-       } else {
-               res->fsize = m.RES_FILE_SIZE_LO;
-       }
+       res->fsize = m.RES_FILE_SIZE;
        res->dev = m.RES_DEV;
        res->uid = (uid_t) m.RES_UID;
        res->gid = (gid_t) m.RES_GID;
@@ -620,11 +612,7 @@ int req_newnode(
   res->fs_e    = m.m_source;
   res->inode_nr = (ino_t) m.RES_INODE_NR;
   res->fmode   = (mode_t) m.RES_MODE;
-  if (vmp->m_fs_flags & RES_64BIT) {
-       res->fsize = make64(m.RES_FILE_SIZE_LO, m.RES_FILE_SIZE_HI);
-  } else {
-       res->fsize = m.RES_FILE_SIZE_LO;
-  }
+  res->fsize    = m.RES_FILE_SIZE;
   res->dev     = m.RES_DEV;
   res->uid     = (uid_t) m.RES_UID;
   res->gid     = (gid_t) m.RES_GID;
@@ -771,11 +759,7 @@ int req_readsuper(
        res->fs_e = m.m_source;
        res->inode_nr = (ino_t) m.RES_INODE_NR;
        res->fmode = (mode_t) m.RES_MODE;
-       if (m.RES_FLAGS & RES_64BIT) {
-               res->fsize = make64(m.RES_FILE_SIZE_LO, m.RES_FILE_SIZE_HI);
-       } else {
-               res->fsize = m.RES_FILE_SIZE_LO;
-       }
+       res->fsize = m.RES_FILE_SIZE;
        res->uid = (uid_t) m.RES_UID;
        res->gid = (gid_t) m.RES_GID;
        *fs_flags = m.RES_FLAGS;