View | Details | Raw Unified | Return to bug 206530 | Differences between
and this patch

Collapse All | Expand All

(-)sys/fs/ext2fs/ext2_dinode.h (+2 lines)
Lines 85-90 Link Here
85
				    EXT2F_ROCOMPAT_EXTRA_ISIZE))
85
				    EXT2F_ROCOMPAT_EXTRA_ISIZE))
86
#define	E2DI_HAS_HUGE_FILE(ip)	(EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs,	\
86
#define	E2DI_HAS_HUGE_FILE(ip)	(EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs,	\
87
				    EXT2F_ROCOMPAT_HUGE_FILE))
87
				    EXT2F_ROCOMPAT_HUGE_FILE))
88
#define	E2DI_HAS_EXTENTS(ip)	(EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs,	\
89
				    EXT2F_INCOMPAT_EXTENTS))
88
90
89
/*
91
/*
90
 * Constants relative to the data blocks
92
 * Constants relative to the data blocks
(-)sys/fs/ext2fs/ext2_inode_cnv.c (-2 / +4 lines)
Lines 110-117 Link Here
110
	ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0;
110
	ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0;
111
	ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0;
111
	ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0;
112
	ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0;
112
	ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0;
113
	ip->i_flag |= (ei->e2di_flags & EXT4_INDEX) ? IN_E4INDEX : 0;
113
	if (E2DI_HAS_EXTENTS(ip)) {
114
	ip->i_flag |= (ei->e2di_flags & EXT4_EXTENTS) ? IN_E4EXTENTS : 0;
114
		ip->i_flag |= (ei->e2di_flags & EXT4_INDEX) ? IN_E4INDEX : 0;
115
		ip->i_flag |= (ei->e2di_flags & EXT4_EXTENTS) ? IN_E4EXTENTS : 0;
116
	}	
115
	ip->i_blocks = ei->e2di_nblock;
117
	ip->i_blocks = ei->e2di_nblock;
116
	if (E2DI_HAS_HUGE_FILE(ip)) {
118
	if (E2DI_HAS_HUGE_FILE(ip)) {
117
		ip->i_blocks |= (uint64_t)ei->e2di_nblock_high << 32;
119
		ip->i_blocks |= (uint64_t)ei->e2di_nblock_high << 32;

Return to bug 206530