ext3: Use search_dirblock() in ext3_dx_find_entry() (5026e90b) · Commits · 戴 / test

fs/ext3/namei.c

+12 −21

Original line number	Diff line number	Diff line
		@@ -975,12 +975,9 @@ static struct buffer_head * ext3_dx_find_entry(struct inode *dir,
		struct super_block *sb = dir->i_sb;
		struct dx_hash_info hinfo;
		struct dx_frame frames[2], *frame;
		struct ext3_dir_entry_2 de, top;
		struct buffer_head *bh;
		unsigned long block;
		int retval;
		int namelen = entry->len;
		const u8 *name = entry->name;

		if (!(frame = dx_probe(entry, dir, &hinfo, frames, err)))
		return NULL;
		@@ -988,26 +985,20 @@ static struct buffer_head * ext3_dx_find_entry(struct inode *dir,
		block = dx_get_block(frame->at);
		if (!(bh = ext3_bread (NULL,dir, block, 0, err)))
		goto errout;
		de = (struct ext3_dir_entry_2 *) bh->b_data;
		top = (struct ext3_dir_entry_2 ) ((char ) de + sb->s_blocksize -
		EXT3_DIR_REC_LEN(0));
		for (; de < top; de = ext3_next_entry(de)) {
		int off = (block << EXT3_BLOCK_SIZE_BITS(sb))
		+ ((char *) de - bh->b_data);

		if (!ext3_check_dir_entry(__func__, dir, de, bh, off)) {
		retval = search_dirblock(bh, dir, entry,
		block << EXT3_BLOCK_SIZE_BITS(sb),
		res_dir);
		if (retval == 1) {
		dx_release(frames);
		return bh;
		}
		brelse(bh);
		if (retval == -1) {
		*err = ERR_BAD_DX_DIR;
		goto errout;
		}

		if (ext3_match(namelen, name, de)) {
		*res_dir = de;
		dx_release(frames);
		return bh;
		}
		}
		brelse (bh);
		/* Check to see if we should continue to search */
		retval = ext3_htree_next_block(dir, hinfo.hash, frame,
		frames, NULL);