Commit 7cd7a36a authored by Jan Kara's avatar Jan Kara
Browse files

udf: Convert udf_readdir() to new directory iteration 



Convert udf_readdir() to new directory iteration functions.

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

fs/udf/dir.c

+27 −121
Original line number Diff line number Diff line
@@ -39,26 +39,13 @@ 
static int udf_readdir(struct file *file, struct dir_context *ctx)

{

	struct inode *dir = file_inode(file);

	struct udf_inode_info *iinfo = UDF_I(dir);

	struct udf_fileident_bh fibh = { .sbh = NULL, .ebh = NULL};

	struct fileIdentDesc *fi = NULL;

	struct fileIdentDesc cfi;

	udf_pblk_t block, iblock;

	loff_t nf_pos, emit_pos = 0;

	int flen;

	unsigned char *fname = NULL, *copy_name = NULL;

	unsigned char *nameptr;

	uint16_t liu;

	uint8_t lfi;

	loff_t size = udf_ext0_offset(dir) + dir->i_size;

	struct buffer_head *tmp, *bha[16];

	struct kernel_lb_addr eloc;

	uint32_t elen;

	sector_t offset;

	int i, num, ret = 0;

	struct extent_position epos = { NULL, 0, {0, 0} };

	unsigned char *fname = NULL;

	int ret = 0;

	struct super_block *sb = dir->i_sb;

	bool pos_valid = false;

	struct udf_fileident_iter iter;



	if (ctx->pos == 0) {

		if (!dir_emit_dot(file, ctx))
@@ -66,7 +53,7 @@ static int udf_readdir(struct file *file, struct dir_context *ctx) 
		ctx->pos = 1;

	}

	nf_pos = (ctx->pos - 1) << 2;

	if (nf_pos >= size)

	if (nf_pos >= dir->i_size)

		goto out;



	/*
@@ -90,138 +77,57 @@ static int udf_readdir(struct file *file, struct dir_context *ctx) 
		goto out;

	}



	if (nf_pos == 0)

		nf_pos = udf_ext0_offset(dir);



	fibh.soffset = fibh.eoffset = nf_pos & (sb->s_blocksize - 1);

	if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {

		if (inode_bmap(dir, nf_pos >> sb->s_blocksize_bits,

		    &epos, &eloc, &elen, &offset)

		    != (EXT_RECORDED_ALLOCATED >> 30)) {

			ret = -ENOENT;

			goto out;

		}

		block = udf_get_lb_pblock(sb, &eloc, offset);

		if ((++offset << sb->s_blocksize_bits) < elen) {

			if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT)

				epos.offset -= sizeof(struct short_ad);

			else if (iinfo->i_alloc_type ==

					ICBTAG_FLAG_AD_LONG)

				epos.offset -= sizeof(struct long_ad);

		} else {

			offset = 0;

		}



		if (!(fibh.sbh = fibh.ebh = udf_tread(sb, block))) {

			ret = -EIO;

			goto out;

		}



		if (!(offset & ((16 >> (sb->s_blocksize_bits - 9)) - 1))) {

			i = 16 >> (sb->s_blocksize_bits - 9);

			if (i + offset > (elen >> sb->s_blocksize_bits))

				i = (elen >> sb->s_blocksize_bits) - offset;

			for (num = 0; i > 0; i--) {

				block = udf_get_lb_pblock(sb, &eloc, offset + i);

				tmp = udf_tgetblk(sb, block);

				if (tmp && !buffer_uptodate(tmp) && !buffer_locked(tmp))

					bha[num++] = tmp;

				else

					brelse(tmp);

			}

			if (num) {

				bh_readahead_batch(num, bha, REQ_RAHEAD);

				for (i = 0; i < num; i++)

					brelse(bha[i]);

			}

		}

	}



	while (nf_pos < size) {

	for (ret = udf_fiiter_init(&iter, dir, nf_pos);

	     !ret && iter.pos < dir->i_size;

	     ret = udf_fiiter_advance(&iter)) {

		struct kernel_lb_addr tloc;

		loff_t cur_pos = nf_pos;

		udf_pblk_t iblock;



		/* Update file position only if we got past the current one */

		if (nf_pos >= emit_pos) {

			ctx->pos = (nf_pos >> 2) + 1;

			pos_valid = true;

		}



		fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &epos, &eloc,

					&elen, &offset);

		if (!fi)

			goto out;

		/* Still not at offset where user asked us to read from? */

		if (cur_pos < emit_pos)

		if (iter.pos < emit_pos)

			continue;



		liu = le16_to_cpu(cfi.lengthOfImpUse);

		lfi = cfi.lengthFileIdent;



		if (fibh.sbh == fibh.ebh) {

			nameptr = udf_get_fi_ident(fi);

		} else {

			int poffset;	/* Unpaded ending offset */



			poffset = fibh.soffset + sizeof(struct fileIdentDesc) + liu + lfi;



			if (poffset >= lfi) {

				nameptr = (char *)(fibh.ebh->b_data + poffset - lfi);

			} else {

				if (!copy_name) {

					copy_name = kmalloc(UDF_NAME_LEN,

							    GFP_NOFS);

					if (!copy_name) {

						ret = -ENOMEM;

						goto out;

					}

				}

				nameptr = copy_name;

				memcpy(nameptr, udf_get_fi_ident(fi),

				       lfi - poffset);

				memcpy(nameptr + lfi - poffset,

				       fibh.ebh->b_data, poffset);

			}

		}

		/* Update file position only if we got past the current one */

		pos_valid = true;

		ctx->pos = (iter.pos >> 2) + 1;



		if ((cfi.fileCharacteristics & FID_FILE_CHAR_DELETED) != 0) {

		if (iter.fi.fileCharacteristics & FID_FILE_CHAR_DELETED) {

			if (!UDF_QUERY_FLAG(sb, UDF_FLAG_UNDELETE))

				continue;

		}



		if ((cfi.fileCharacteristics & FID_FILE_CHAR_HIDDEN) != 0) {

		if (iter.fi.fileCharacteristics & FID_FILE_CHAR_HIDDEN) {

			if (!UDF_QUERY_FLAG(sb, UDF_FLAG_UNHIDE))

				continue;

		}



		if (cfi.fileCharacteristics & FID_FILE_CHAR_PARENT) {

		if (iter.fi.fileCharacteristics & FID_FILE_CHAR_PARENT) {

			if (!dir_emit_dotdot(file, ctx))

				goto out;

				goto out_iter;

			continue;

		}



		flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN);

		flen = udf_get_filename(sb, iter.name,

				iter.fi.lengthFileIdent, fname, UDF_NAME_LEN);

		if (flen < 0)

			continue;



		tloc = lelb_to_cpu(cfi.icb.extLocation);

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

		iblock = udf_get_lb_pblock(sb, &tloc, 0);

		if (!dir_emit(ctx, fname, flen, iblock, DT_UNKNOWN))

			goto out;

	} /* end while */

			goto out_iter;

	}



	ctx->pos = (nf_pos >> 2) + 1;

	if (!ret) {

		ctx->pos = (iter.pos >> 2) + 1;

		pos_valid = true;



	}

out_iter:

	udf_fiiter_release(&iter);

out:

	if (pos_valid)

		file->f_version = inode_query_iversion(dir);

	if (fibh.sbh != fibh.ebh)

		brelse(fibh.ebh);

	brelse(fibh.sbh);

	brelse(epos.bh);

	kfree(fname);

	kfree(copy_name);



	return ret;

}