[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1176984336.3812.10.camel@garfield>
Date: Thu, 19 Apr 2007 17:35:36 +0530
From: Kalpak Shah <kalpak@...sterfs.com>
To: TheodoreTso <tytso@....edu>
Cc: linux-ext4 <linux-ext4@...r.kernel.org>
Subject: [PATCH] e2fsprogs: Offsets of EAs in inode need not be sorted
Hi,
This patch removes a code snippet from check_ea_in_inode() in pass1 which checks if the EA values in the inode are sorted or not. The comments in fs/ext*/xattr.c state that the EA values in the external EA block are sorted but those in the inode need not be sorted. I have also attached a test image which has unsorted EAs in the inodes. The current e2fsck wrongly clears the EAs in the inode.
Signed-off-by: Kalpak Shah <kalpak@...sterfs.com>
Index: e2fsprogs-1.40/e2fsck/pass1.c
===================================================================
--- e2fsprogs-1.40.orig/e2fsck/pass1.c
+++ e2fsprogs-1.40/e2fsck/pass1.c
@@ -246,7 +246,7 @@ static void check_ea_in_inode(e2fsck_t c
struct ext2_inode_large *inode;
struct ext2_ext_attr_entry *entry;
char *start, *end;
- unsigned int storage_size, remain, offs;
+ unsigned int storage_size, remain;
int problem = 0;
inode = (struct ext2_inode_large *) pctx->inode;
@@ -261,7 +261,6 @@ static void check_ea_in_inode(e2fsck_t c
/* take finish entry 0UL into account */
remain = storage_size - sizeof(__u32);
- offs = end - start;
while (!EXT2_EXT_IS_LAST_ENTRY(entry)) {
@@ -285,15 +284,6 @@ static void check_ea_in_inode(e2fsck_t c
goto fix;
}
- /* check value placement */
- if (entry->e_value_offs +
- EXT2_XATTR_SIZE(entry->e_value_size) != offs) {
- printf("(entry->e_value_offs + entry->e_value_size: %d, offs: %d)\n", entry->e_value_offs + entry->e_value_size, offs);
- pctx->num = entry->e_value_offs;
- problem = PR_1_ATTR_VALUE_OFFSET;
- goto fix;
- }
-
/* e_value_block must be 0 in inode's ea */
if (entry->e_value_block != 0) {
pctx->num = entry->e_value_block;
@@ -309,7 +299,6 @@ static void check_ea_in_inode(e2fsck_t c
}
remain -= entry->e_value_size;
- offs -= EXT2_XATTR_SIZE(entry->e_value_size);
entry = EXT2_EXT_ATTR_NEXT(entry);
}
Thanks,
Kalpak Shah.
<kalpak@...sterfs.com>
Download attachment "foo.img.gz" of type "application/x-gzip" (15676 bytes)
Powered by blists - more mailing lists