From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 09/14] minix: change types in header file
Date: Sun, 16 Dec 2012 10:43:57 +0000 [thread overview]
Message-ID: <1355654642-22106-10-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1355654642-22106-1-git-send-email-kerolasa@iki.fi>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
disk-utils/minix_programs.h | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/disk-utils/minix_programs.h b/disk-utils/minix_programs.h
index 4af1a34..7ad308d 100644
--- a/disk-utils/minix_programs.h
+++ b/disk-utils/minix_programs.h
@@ -28,7 +28,7 @@ static inline unsigned long get_ninodes(void)
case 3:
return Super3.s_ninodes;
default:
- return (unsigned long)Super.s_ninodes;
+ return Super.s_ninodes;
}
}
@@ -36,11 +36,11 @@ static inline unsigned long get_nzones(void)
{
switch (fs_version) {
case 3:
- return (unsigned long)Super3.s_zones;
+ return Super3.s_zones;
case 2:
- return (unsigned long)Super.s_zones;
+ return Super.s_zones;
default:
- return (unsigned long)Super.s_nzones;
+ return Super.s_nzones;
}
}
@@ -48,9 +48,9 @@ static inline unsigned long get_nimaps(void)
{
switch (fs_version) {
case 3:
- return (unsigned long)Super3.s_imap_blocks;
+ return Super3.s_imap_blocks;
default:
- return (unsigned long)Super.s_imap_blocks;
+ return Super.s_imap_blocks;
}
}
@@ -58,43 +58,43 @@ static inline unsigned long get_nzmaps(void)
{
switch (fs_version) {
case 3:
- return (unsigned long)Super3.s_zmap_blocks;
+ return Super3.s_zmap_blocks;
default:
- return (unsigned long)Super.s_zmap_blocks;
+ return Super.s_zmap_blocks;
}
}
-static inline unsigned long get_first_zone(void)
+static inline off_t get_first_zone(void)
{
switch (fs_version) {
case 3:
- return (unsigned long)Super3.s_firstdatazone;
+ return Super3.s_firstdatazone;
default:
- return (unsigned long)Super.s_firstdatazone;
+ return Super.s_firstdatazone;
}
}
-static inline unsigned long get_zone_size(void)
+static inline size_t get_zone_size(void)
{
switch (fs_version) {
case 3:
- return (unsigned long)Super3.s_log_zone_size;
+ return Super3.s_log_zone_size;
default:
- return (unsigned long)Super.s_log_zone_size;
+ return Super.s_log_zone_size;
}
}
-static inline unsigned long get_max_size(void)
+static inline size_t get_max_size(void)
{
switch (fs_version) {
case 3:
- return (unsigned long)Super3.s_max_size;
+ return Super3.s_max_size;
default:
- return (unsigned long)Super.s_max_size;
+ return Super.s_max_size;
}
}
-static unsigned long inode_blocks(void)
+static inline unsigned long inode_blocks(void)
{
switch (fs_version) {
case 3:
@@ -105,12 +105,12 @@ static unsigned long inode_blocks(void)
}
}
-static inline unsigned long first_zone_data(void)
+static inline off_t first_zone_data(void)
{
return 2 + get_nimaps() + get_nzmaps() + inode_blocks();
}
-static inline unsigned long get_inode_buffer_size(void)
+static inline size_t get_inode_buffer_size(void)
{
return inode_blocks() * MINIX_BLOCK_SIZE;
}
--
1.8.0.2
next prev parent reply other threads:[~2012-12-16 10:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 10:43 [00/14]: pull: ipcs resubmission, bug fixes, minix todo, etc Sami Kerola
2012-12-16 10:43 ` [PATCH 01/14] docs: swapon.8 option name fix Sami Kerola
2012-12-16 10:43 ` [PATCH 02/14] ipcs: assist debugging Sami Kerola
2012-12-16 10:43 ` [PATCH 03/14] ipcs: add --human readable size conversion option Sami Kerola
2012-12-16 10:43 ` [PATCH 04/14] ipcs: add --bytes size output option Sami Kerola
2012-12-16 10:43 ` [PATCH 05/14] isosize: fix usage() -h option print out Sami Kerola
2012-12-16 10:43 ` [PATCH 06/14] isosize: inform if file does not look like iso file system Sami Kerola
2012-12-16 10:43 ` [PATCH 07/14] more: remove unnecessary variable Sami Kerola
2012-12-16 10:43 ` [PATCH 08/14] tunelp: deprecation: remove command from default build Sami Kerola
2012-12-16 10:43 ` Sami Kerola [this message]
2012-12-16 10:43 ` [PATCH 10/14] minix: use off_t, size_t, etc appropriate types Sami Kerola
2012-12-16 10:43 ` [PATCH 11/14] minix: replace magic constants with macro names Sami Kerola
2012-12-16 10:44 ` [PATCH 12/14] docs: add missing exit value to fsck.minix(8) Sami Kerola
2012-12-16 10:44 ` [PATCH 13/14] lib/ismounted: detect loopback mounts Sami Kerola
2012-12-19 13:38 ` Karel Zak
2012-12-16 10:44 ` [PATCH 14/14] docs: fsck(8), mkfs(8): update manual references Sami Kerola
2012-12-19 13:54 ` Karel Zak
2012-12-19 14:29 ` [00/14]: pull: ipcs resubmission, bug fixes, minix todo, etc Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355654642-22106-10-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox