Commit 200918b3 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Convert udf_lookup() to use new directory iteration code 



Convert udf_lookup() to use udf_fiiter_find_entry() for looking up
directory entries.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 1c80afa0

fs/udf/namei.c

+8 −11
Original line number Diff line number Diff line
@@ -366,25 +366,22 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry, 
				 unsigned int flags)

{

	struct inode *inode = NULL;

	struct fileIdentDesc cfi;

	struct udf_fileident_bh fibh;

	struct fileIdentDesc *fi;

	struct udf_fileident_iter iter;

	int err;



	if (dentry->d_name.len > UDF_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);



	fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi);

	if (IS_ERR(fi))

		return ERR_CAST(fi);

	err = udf_fiiter_find_entry(dir, &dentry->d_name, &iter);

	if (err < 0 && err != -ENOENT)

		return ERR_PTR(err);



	if (fi) {

	if (err == 0) {

		struct kernel_lb_addr loc;



		if (fibh.sbh != fibh.ebh)

			brelse(fibh.ebh);

		brelse(fibh.sbh);

		loc = lelb_to_cpu(iter.fi.icb.extLocation);

		udf_fiiter_release(&iter);



		loc = lelb_to_cpu(cfi.icb.extLocation);

		inode = udf_iget(dir->i_sb, &loc);

		if (IS_ERR(inode))

			return ERR_CAST(inode);