Macintosh-SW
/
EMILE
mirror of https://github.com/vivier/EMILE.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly use linux/ext2_fs.h or ext2fs/ext2_fs.h 

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Laurent Vivier 2015-11-08 22:42:27 +01:00
parent e1d35789fb
commit 91a43e63c2
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Rules.mk
View File

@ -30,3 +30,7 @@ else
clean:
rm -f $(OBJS) $(PROGRAMS) $(LIBRARY) $(CLEAN) $(LIBRARIES)
endif
ifeq ($(shell readlink -e /usr/include/linux/ext2_fs.h),)
CPPFLAGS += -DCONFIG_E2FSLIBS
endif

4
libext2/ext2.h
View File

@ -9,7 +9,11 @@
#include <unistd.h>
#include <linux/fs.h>
#ifdef CONFIG_E2FSLIBS
#include <ext2fs/ext2_fs.h>
#else
#include <linux/ext2_fs.h>
#endif
#include <libstream.h>

15
libext2/ext2_utils.c
View File

@ -24,9 +24,17 @@ void ext2_get_super(device_io_t *device, struct ext2_super_block *super)
super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count);
super->s_first_data_block = __le32_to_cpu(super->s_first_data_block);
super->s_log_block_size = __le32_to_cpu(super->s_log_block_size);
#ifdef CONFIG_E2FSLIBS
super->s_log_cluster_size = __le32_to_cpu(super->s_log_cluster_size);
#else
super->s_log_frag_size = __le32_to_cpu(super->s_log_frag_size);
#endif
super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group);
#ifdef CONFIG_E2FSLIBS
super->s_clusters_per_group = __le32_to_cpu(super->s_clusters_per_group);
#else
super->s_frags_per_group = __le32_to_cpu(super->s_frags_per_group);
#endif
super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group);
super->s_mtime = __le32_to_cpu(super->s_mtime);
super->s_wtime = __le32_to_cpu(super->s_wtime);
@ -150,15 +158,22 @@ int ext2_get_inode(ext2_VOLUME* volume,
inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl);
inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl);
inode->i_faddr = __le32_to_cpu(le_inode->i_faddr);
#ifdef CONFIG_E2FSLIBS
inode->osd2.linux2.l_i_blocks_hi =
__le16_to_cpu(le_inode->osd2.linux2.l_i_blocks_hi);
inode->osd2.linux2.l_i_file_acl_high =
__le16_to_cpu(le_inode->osd2.linux2.l_i_file_acl_high);
#else
inode->osd2.linux2.l_i_frag = le_inode->osd2.linux2.l_i_frag;
inode->osd2.linux2.l_i_fsize = le_inode->osd2.linux2.l_i_fsize;
#endif
inode->osd2.linux2.l_i_uid_high =
__le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high);
inode->osd2.linux2.l_i_gid_high =
__le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high);
#ifdef CONFIG_E2FSLIBS
#endif
return 0;
}

4
libext2/ext2_utils.h
View File

@ -8,7 +8,11 @@
#define __EXT2_UTILS_H__
#include <linux/fs.h>
#ifdef CONFIG_E2FSLIBS
#include <ext2fs/ext2_fs.h>
#else
#include <linux/ext2_fs.h>
#endif
#include <libstream.h>
#include "ext2.h"

4
tools/ext2_ls.c
View File

@ -16,7 +16,11 @@
#include <linux/fs.h>
#ifdef CONFIG_E2FSLIBS
#include <ext2fs/ext2_fs.h>
#else
#include <linux/ext2_fs.h>
#endif
#include <libext2.h>
#include "device.h"