Attachment 152294 Details for Bug 232663 – more fun with byteswapping

[patch] more fun with byteswapping

e2fsprogs-1.39-swapfs.patch (text/plain), 1.98 KB, created by Bryn M. Reeves on 2007-04-11 17:29:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-04-11 17:29:41 UTC

Size: 1.98 KB

patch

obsolete

>--- e2fsprogs-1.39/e2fsck/pass2.c.swapfs	2007-03-19 22:12:21.000000000 +0000
>+++ e2fsprogs-1.39/e2fsck/pass2.c	2007-03-19 22:13:10.000000000 +0000
>@@ -1187,22 +1187,6 @@
> 	    !(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) {
> 		if (fix_problem(ctx, PR_2_FILE_ACL_ZERO, &pctx)) {
> 			inode.i_file_acl = 0;
>-#ifdef EXT2FS_ENABLE_SWAPFS
>-			/* 
>-			 * This is a special kludge to deal with long
>-			 * symlinks on big endian systems.  i_blocks
>-			 * had already been decremented earlier in
>-			 * pass 1, but since i_file_acl hadn't yet
>-			 * been cleared, ext2fs_read_inode() assumed
>-			 * that the file was short symlink and would
>-			 * not have byte swapped i_block[0].  Hence,
>-			 * we have to byte-swap it here.
>-			 */
>-			if (LINUX_S_ISLNK(inode.i_mode) &&
>-			    (fs->flags & EXT2_FLAG_SWAP_BYTES) &&
>-			    (inode.i_blocks == fs->blocksize >> 9))
>-				inode.i_block[0] = ext2fs_swab32(inode.i_block[0]);
>-#endif
> 			inode_modified++;
> 		} else
> 			not_fixed++;
>--- e2fsprogs-1.39/lib/ext2fs/swapfs.c.swapfs	2007-03-16 02:58:01.000000000 +0000
>+++ e2fsprogs-1.39/lib/ext2fs/swapfs.c	2007-03-19 22:11:09.000000000 +0000
>@@ -124,7 +124,7 @@
> 			    struct ext2_inode_large *f, int hostorder,
> 			    int bufsize)
> {
>-	unsigned i;
>+	unsigned i, has_data_blocks;
> 	int islnk = 0;
> 	__u32 *eaf, *eat;
> 
>@@ -141,11 +141,15 @@
> 	t->i_dtime = ext2fs_swab32(f->i_dtime);
> 	t->i_gid = ext2fs_swab16(f->i_gid);
> 	t->i_links_count = ext2fs_swab16(f->i_links_count);
>+	if (hostorder)
>+		has_data_blocks = ext2fs_inode_data_blocks(fs, f);
> 	t->i_blocks = ext2fs_swab32(f->i_blocks);
>+	if (!hostorder)
>+		has_data_blocks = ext2fs_inode_data_blocks(fs, t);
> 	t->i_flags = ext2fs_swab32(f->i_flags);
> 	t->i_file_acl = ext2fs_swab32(f->i_file_acl);
> 	t->i_dir_acl = ext2fs_swab32(f->i_dir_acl);
>-	if (!islnk || ext2fs_inode_data_blocks(fs, (struct ext2_inode *)t)) {
>+	if (!islnk || has_data_blocks ) {
> 		for (i = 0; i < EXT2_N_BLOCKS; i++)
> 			t->i_block[i] = ext2fs_swab32(f->i_block[i]);
> 	} else if (t != f) {

Actions: View | Diff

Attachments on bug 232663: 150239 | 150246 | 150286 | 152294 | 152295 | 152296