Attachment 166027 Details for Bug 206530 – Alternative workaround

[patch] Alternative workaround

ext2fs-ext4flags.diff (text/plain), 1.34 KB, created by Pedro F. Giffuni on 2016-01-23 21:01:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-01-23 21:01:34 UTC

Size: 1.34 KB

patch

obsolete

>Index: sys/fs/ext2fs/ext2_dinode.h
>===================================================================
>--- sys/fs/ext2fs/ext2_dinode.h	(revision 294636)
>+++ sys/fs/ext2fs/ext2_dinode.h	(working copy)
>@@ -85,6 +85,8 @@
> 				    EXT2F_ROCOMPAT_EXTRA_ISIZE))
> #define	E2DI_HAS_HUGE_FILE(ip)	(EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs,	\
> 				    EXT2F_ROCOMPAT_HUGE_FILE))
>+#define	E2DI_HAS_EXTENTS(ip)	(EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs,	\
>+				    EXT2F_INCOMPAT_EXTENTS))
> 
> /*
>  * Constants relative to the data blocks
>Index: sys/fs/ext2fs/ext2_inode_cnv.c
>===================================================================
>--- sys/fs/ext2fs/ext2_inode_cnv.c	(revision 294636)
>+++ sys/fs/ext2fs/ext2_inode_cnv.c	(working copy)
>@@ -110,8 +110,10 @@
> 	ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0;
> 	ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0;
> 	ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0;
>-	ip->i_flag |= (ei->e2di_flags & EXT4_INDEX) ? IN_E4INDEX : 0;
>-	ip->i_flag |= (ei->e2di_flags & EXT4_EXTENTS) ? IN_E4EXTENTS : 0;
>+	if (E2DI_HAS_EXTENTS(ip)) {
>+		ip->i_flag |= (ei->e2di_flags & EXT4_INDEX) ? IN_E4INDEX : 0;
>+		ip->i_flag |= (ei->e2di_flags & EXT4_EXTENTS) ? IN_E4EXTENTS : 0;
>+	}	
> 	ip->i_blocks = ei->e2di_nblock;
> 	if (E2DI_HAS_HUGE_FILE(ip)) {
> 		ip->i_blocks |= (uint64_t)ei->e2di_nblock_high << 32;

Actions: View | Diff

Attachments on bug 206530: 166011 | 166027