Commit 101ee137 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Drop VARCONV support 



UDF was supporting a strange mode where the media was containing 7
blocks of unknown data for every 32 blocks of the filesystem. I have yet
to see the media that would need such conversion (maybe it comes from
packet writing times) and the conversions have been inconsistent in the
code. In particular any write will write to a wrong block and corrupt
the media. This is an indication and no user actually needs this so
let's just drop the support instead of trying to fix it.

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

fs/udf/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int read_block_bitmap(struct super_block *sb, 
	loc.logicalBlockNum = bitmap->s_extPosition;

	loc.partitionReferenceNum = UDF_SB(sb)->s_partition;



	bh = udf_tread(sb, udf_get_lb_pblock(sb, &loc, block));

	bh = sb_bread(sb, udf_get_lb_pblock(sb, &loc, block));

	if (!bh)

		retval = -EIO;

fs/udf/directory.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void udf_readahead_dir(struct udf_fileident_iter *iter) 
	for (i = 0; i < ralen; i++) {

		blk = udf_get_lb_pblock(iter->dir->i_sb, &iter->eloc,

					iter->loffset + i);

		tmp = udf_tgetblk(iter->dir->i_sb, blk);

		tmp = sb_getblk(iter->dir->i_sb, blk);

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

			bha[num++] = tmp;

		else
@@ -160,7 +160,7 @@ static struct buffer_head *udf_fiiter_bread_blk(struct udf_fileident_iter *iter) 


	udf_readahead_dir(iter);

	blk = udf_get_lb_pblock(iter->dir->i_sb, &iter->eloc, iter->loffset);

	return udf_tread(iter->dir->i_sb, blk);

	return sb_bread(iter->dir->i_sb, blk);

}



/*

fs/udf/inode.c

+4 −7
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ static int udf_update_inode(struct inode *inode, int do_sync) 
	unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits;

	struct udf_inode_info *iinfo = UDF_I(inode);



	bh = udf_tgetblk(inode->i_sb,

	bh = sb_getblk(inode->i_sb,

			udf_get_lb_pblock(inode->i_sb, &iinfo->i_location, 0));

	if (!bh) {

		udf_debug("getblk failure\n");
@@ -1852,7 +1852,7 @@ int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block, 
	neloc.logicalBlockNum = block;

	neloc.partitionReferenceNum = epos->block.partitionReferenceNum;



	bh = udf_tgetblk(sb, udf_get_lb_pblock(sb, &neloc, 0));

	bh = sb_getblk(sb, udf_get_lb_pblock(sb, &neloc, 0));

	if (!bh)

		return -EIO;

	lock_buffer(bh);
@@ -2069,7 +2069,7 @@ int8_t udf_next_aext(struct inode *inode, struct extent_position *epos, 
		epos->offset = sizeof(struct allocExtDesc);

		brelse(epos->bh);

		block = udf_get_lb_pblock(inode->i_sb, &epos->block, 0);

		epos->bh = udf_tread(inode->i_sb, block);

		epos->bh = sb_bread(inode->i_sb, block);

		if (!epos->bh) {

			udf_debug("reading block %u failed!\n", block);

			return -1;
@@ -2290,8 +2290,5 @@ udf_pblk_t udf_block_map(struct inode *inode, sector_t block) 
	up_read(&UDF_I(inode)->i_data_sem);

	brelse(epos.bh);



	if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_VARCONV))

		return udf_fixed_to_variable(ret);

	else

	return ret;

}

fs/udf/misc.c

+1 −17
Original line number Diff line number Diff line
@@ -28,22 +28,6 @@ 
#include "udf_i.h"

#include "udf_sb.h"



struct buffer_head *udf_tgetblk(struct super_block *sb, udf_pblk_t block)

{

	if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV))

		return sb_getblk(sb, udf_fixed_to_variable(block));

	else

		return sb_getblk(sb, block);

}



struct buffer_head *udf_tread(struct super_block *sb, udf_pblk_t block)

{

	if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV))

		return sb_bread(sb, udf_fixed_to_variable(block));

	else

		return sb_bread(sb, block);

}



struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,

					   uint32_t type, uint8_t loc)

{
@@ -216,7 +200,7 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block, 
	if (block == 0xFFFFFFFF)

		return NULL;



	bh = udf_tread(sb, block);

	bh = sb_bread(sb, block);

	if (!bh) {

		udf_err(sb, "read failed, block=%u, location=%u\n",

			block, location);

fs/udf/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct buffer_head *udf_expand_dir_adinicb(struct inode *inode, 
				0);

	if (!newblock)

		return NULL;

	dbh = udf_tgetblk(inode->i_sb, newblock);

	dbh = sb_getblk(inode->i_sb, newblock);

	if (!dbh)

		return NULL;

	lock_buffer(dbh);
@@ -623,7 +623,7 @@ static int udf_symlink(struct user_namespace *mnt_userns, struct inode *dir, 
		block = udf_get_pblock(sb, block,

				iinfo->i_location.partitionReferenceNum,

				0);

		epos.bh = udf_tgetblk(sb, block);

		epos.bh = sb_getblk(sb, block);

		if (unlikely(!epos.bh)) {

			err = -ENOMEM;

			udf_free_blocks(sb, inode, &eloc, 0, 1);