Commit 7845c049 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: use search_dirblock() in ext4_dx_find_entry()



Use the search_dirblock() in ext4_dx_find_entry().  It makes the code
easier to read, and it takes advantage of common code.  It also saves
100 bytes or so of text space.
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: Brad Spengler <spender@grsecurity.net>
parent 8941ec8b
...@@ -974,39 +974,30 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct q ...@@ -974,39 +974,30 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct q
struct super_block * sb = dir->i_sb; struct super_block * sb = dir->i_sb;
struct dx_hash_info hinfo; struct dx_hash_info hinfo;
struct dx_frame frames[2], *frame; struct dx_frame frames[2], *frame;
struct ext4_dir_entry_2 *de, *top;
struct buffer_head *bh; struct buffer_head *bh;
ext4_lblk_t block; ext4_lblk_t block;
int retval; int retval;
int namelen = d_name->len;
const u8 *name = d_name->name;
if (!(frame = dx_probe(d_name, dir, &hinfo, frames, err))) if (!(frame = dx_probe(d_name, dir, &hinfo, frames, err)))
return NULL; return NULL;
do { do {
block = dx_get_block(frame->at); block = dx_get_block(frame->at);
if (!(bh = ext4_bread (NULL,dir, block, 0, err))) if (!(bh = ext4_bread(NULL, dir, block, 0, err)))
goto errout; goto errout;
de = (struct ext4_dir_entry_2 *) bh->b_data;
top = (struct ext4_dir_entry_2 *) ((char *) de + sb->s_blocksize -
EXT4_DIR_REC_LEN(0));
for (; de < top; de = ext4_next_entry(de, sb->s_blocksize)) {
int off = (block << EXT4_BLOCK_SIZE_BITS(sb))
+ ((char *) de - bh->b_data);
if (!ext4_check_dir_entry(dir, de, bh, off)) {
brelse(bh);
*err = ERR_BAD_DX_DIR;
goto errout;
}
if (ext4_match(namelen, name, de)) { retval = search_dirblock(bh, dir, d_name,
*res_dir = de; block << EXT4_BLOCK_SIZE_BITS(sb),
dx_release(frames); res_dir);
return bh; if (retval == 1) { /* Success! */
} dx_release(frames);
return bh;
} }
brelse(bh); brelse(bh);
if (retval == -1) {
*err = ERR_BAD_DX_DIR;
goto errout;
}
/* Check to see if we should continue to search */ /* Check to see if we should continue to search */
retval = ext4_htree_next_block(dir, hinfo.hash, frame, retval = ext4_htree_next_block(dir, hinfo.hash, frame,
frames, NULL); frames, NULL);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment