[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 46/53: mach-defpager: fix type of size arguments
From: |
Samuel Thibault |
Subject: |
[hurd] 46/53: mach-defpager: fix type of size arguments |
Date: |
Thu, 20 Mar 2014 02:23:52 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 109169ca9d8835227cbfcf2c2da5434232e2c6ec
Author: Justus Winter <address@hidden>
Date: Wed Mar 12 15:06:20 2014 +0100
mach-defpager: fix type of size arguments
* mach-defpager/default_pager.c (new_partition): Fix type of bsize.
* mach-defpager/file_io.h (page_read_file_direct): Fix type of size
argument.
(page_write_file_direct): Likewise.
* mach-defpager/setup.c (page_read_file_direct): Likewise.
(page_write_file_direct): Likewise.
---
mach-defpager/default_pager.c | 3 ++-
mach-defpager/file_io.h | 6 +++---
mach-defpager/setup.c | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
index 4127126..362697e 100644
--- a/mach-defpager/default_pager.c
+++ b/mach-defpager/default_pager.c
@@ -253,7 +253,8 @@ new_partition (const char *name, struct file_direct *fdp,
{
/* Filesystem block size is smaller than page size,
so we must do several reads to get the whole page. */
- vm_address_t baddr, bsize;
+ vm_address_t baddr;
+ vm_size_t bsize;
rc = page_read_file_direct(part->file,
rsize, LINUX_PAGE_SIZE-rsize,
&baddr,
diff --git a/mach-defpager/file_io.h b/mach-defpager/file_io.h
index d0b03f3..2721412 100644
--- a/mach-defpager/file_io.h
+++ b/mach-defpager/file_io.h
@@ -57,13 +57,13 @@ struct file_direct
int page_read_file_direct (struct file_direct *fdp,
vm_offset_t offset,
vm_size_t size,
- vm_offset_t *addr, /* out */
- mach_msg_type_number_t *size_read); /* out */
+ vm_offset_t *addr, /* out */
+ vm_size_t *size_read); /* out */
int page_write_file_direct(struct file_direct *fdp,
vm_offset_t offset,
vm_offset_t addr,
vm_size_t size,
- vm_offset_t *size_written); /* out */
+ vm_size_t *size_written); /* out */
#endif /* file_io.h */
diff --git a/mach-defpager/setup.c b/mach-defpager/setup.c
index 080b0fa..7c1afbc 100644
--- a/mach-defpager/setup.c
+++ b/mach-defpager/setup.c
@@ -106,8 +106,8 @@ int
page_read_file_direct (struct file_direct *fdp,
vm_offset_t offset,
vm_size_t size,
- vm_offset_t *addr, /* out */
- mach_msg_type_number_t *size_read) /* out */
+ vm_offset_t *addr, /* out */
+ vm_size_t *size_read) /* out */
{
struct storage_run *r;
error_t err;
@@ -173,7 +173,7 @@ page_write_file_direct(struct file_direct *fdp,
vm_offset_t offset,
vm_offset_t addr,
vm_size_t size,
- vm_offset_t *size_written) /* out */
+ vm_size_t *size_written) /* out */
{
struct storage_run *r;
error_t err;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 28/53: trans/mtab: do not map unknown source strings to "none", (continued)
- [hurd] 28/53: trans/mtab: do not map unknown source strings to "none", Samuel Thibault, 2014/03/19
- [hurd] 34/53: hurd: add IIOCTL_IMPORTS, Samuel Thibault, 2014/03/19
- [hurd] 48/53: Fix crash on opening /dev/kbd or mouse without any console being active, Samuel Thibault, 2014/03/19
- [hurd] 44/53: mach-defpager: fix warning about uninitialized variable, Samuel Thibault, 2014/03/19
- [hurd] 38/53: trans/ifsock: fix receiver lookup, Samuel Thibault, 2014/03/19
- [hurd] 40/53: mach-defpager: remove comments around form feeds, Samuel Thibault, 2014/03/19
- [hurd] 45/53: mach-defpager: fix warnings about uninitialized variables, Samuel Thibault, 2014/03/19
- [hurd] 41/53: mach-defpager: fix warnings about unused variables, Samuel Thibault, 2014/03/19
- [hurd] 32/53: pfinet: improve the mig mutator functions, Samuel Thibault, 2014/03/19
- [hurd] 47/53: mach-defpager: silently ignore requests to page to active partition, Samuel Thibault, 2014/03/19
- [hurd] 46/53: mach-defpager: fix type of size arguments,
Samuel Thibault <=
- [hurd] 35/53: pfinet: fix receiver lookups in iioctl-ops.c, Samuel Thibault, 2014/03/19
- [hurd] 49/53: Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd, Samuel Thibault, 2014/03/19
- [hurd] 30/53: libnetfs: fix receiver lookups in fsys server functions, Samuel Thibault, 2014/03/19
- [hurd] 50/53: Fix crash on accessing vcs without a console being active, Samuel Thibault, 2014/03/19
- [hurd] 37/53: term: fix receiver lookups in the term server functions, Samuel Thibault, 2014/03/19
- [hurd] 33/53: libtrivfs: improve the mig mutator functions, Samuel Thibault, 2014/03/19
- [hurd] 51/53: Fix vcs_readlink propagating error returned by console_current_id, Samuel Thibault, 2014/03/19
- [hurd] 53/53: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2014/03/19
- [hurd] 52/53: Fix handling of console readlink errors, Samuel Thibault, 2014/03/19
- [hurd] 04/53: isofs: add bz2 to OTHERLIBS, Samuel Thibault, 2014/03/19