diff --git a/[refs] b/[refs] index e7a7f3a11bff..6c7162e7ab13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e9510b0e0de657ca7c7bfb10ced80b4d237dd58 +refs/heads/master: 1f605b302724120777a1c38743cb20e2c8807333 diff --git a/trunk/fs/ext2/xattr.c b/trunk/fs/ext2/xattr.c index f3ffbf1cc8d0..c2e4dce984d2 100644 --- a/trunk/fs/ext2/xattr.c +++ b/trunk/fs/ext2/xattr.c @@ -199,14 +199,6 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_get", goto found; entry = next; } - /* Check the remaining name entries */ - while (!IS_LAST_ENTRY(entry)) { - struct ext2_xattr_entry *next = - EXT2_XATTR_NEXT(entry); - if ((char *)next >= end) - goto bad_block; - entry = next; - } if (ext2_xattr_cache_insert(bh)) ea_idebug(inode, "cache insert failed"); error = -ENODATA;