ahill/nilfs-utils
1
0
Fork 0
mirror of https://github.com/nilfs-dev/nilfs-utils.git synced 2026-01-26 13:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

nilfs2-utils: fix gcc-4.2 warnings on 64-bit machines

Browse Source 
Gcc-4.2 warns against casts from pointer to interger of different size.
Nilfs partially used this type of cast to calculate structure-member
offsets, and led to warnings on some 64-bit environments.

This fixes the problem by changing the type of offset calculation macros
to long or unsigned long.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi 2008-02-21 18:57:23 +09:00
parent e1d249f4fb
commit 4763d7e8a7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/nilfs_fs.h
View File

@ -124,10 +124,12 @@ struct nilfs_super_root {
struct nilfs_inode sr_sufile;
};
#define NILFS_SR_MDT_OFFSET(nilfs,i) ((unsigned int)(&((struct nilfs_super_root *)0)->sr_dat) + (nilfs)->ns_inode_size * (i))
#define NILFS_SR_DAT_OFFSET(nilfs) NILFS_SR_MDT_OFFSET(nilfs,0)
#define NILFS_SR_CPFILE_OFFSET(nilfs) NILFS_SR_MDT_OFFSET(nilfs,1)
#define NILFS_SR_SUFILE_OFFSET(nilfs) NILFS_SR_MDT_OFFSET(nilfs,2)
#define NILFS_SR_MDT_OFFSET(inode_size, i) \
((unsigned long)&((struct nilfs_super_root *)0)->sr_dat + \
(inode_size) * (i))
#define NILFS_SR_DAT_OFFSET(inode_size) NILFS_SR_MDT_OFFSET(inode_size,0)
#define NILFS_SR_CPFILE_OFFSET(inode_size) NILFS_SR_MDT_OFFSET(inode_size,1)
#define NILFS_SR_SUFILE_OFFSET(inode_size) NILFS_SR_MDT_OFFSET(inode_size,2)
#define NILFS_SR_BYTES (sizeof(struct nilfs_super_root))
/*
@ -236,7 +238,8 @@ struct nilfs_super_block {
/*
* Bytes count of super_block for CRC-calculation
*/
#define NILFS_SB_BYTES ((int)(((struct nilfs_super_block *)0)->s_reserved))
#define NILFS_SB_BYTES \
((long)&((struct nilfs_super_block *)0)->s_reserved)
/*
* Special inode number