Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05343c4f authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

udf: fix adding entry to a directory 



When adding directory entry to a directory, we have to properly increase
length of the last extent.  Handle this similarly as extending regular files -
make extents always have size multiple of block size (it will be truncated
down to proper size in udf_clear_inode()).

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af793295

fs/udf/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ struct buffer_head *udf_expand_dir_adinicb(struct inode *inode, int *block, 
	eloc.logicalBlockNum = *block;

	eloc.partitionReferenceNum =

				iinfo->i_location.partitionReferenceNum;

	elen = inode->i_size;

	elen = inode->i_sb->s_blocksize;

	iinfo->i_lenExtents = elen;

	epos.bh = NULL;

	epos.block = iinfo->i_location;

fs/udf/namei.c

+10 −9
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, 
		}



		block = dinfo->i_location.logicalBlockNum;



	} else {

		block = udf_get_lb_pblock(dir->i_sb, dinfo->i_location, 0);

		fibh->sbh = fibh->ebh = NULL;
@@ -474,6 +473,14 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, 
	}



add:

	if (dinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {

		elen = (elen + sb->s_blocksize - 1) & ~(sb->s_blocksize - 1);

		if (dinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT)

			epos.offset -= sizeof(short_ad);

		else if (dinfo->i_alloc_type == ICBTAG_FLAG_AD_LONG)

			epos.offset -= sizeof(long_ad);

		udf_write_aext(dir, &epos, eloc, elen, 1);

	}

	f_pos += nfidlen;



	if (dinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB &&
@@ -491,15 +498,9 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, 
		if (!fibh->sbh)

			return NULL;

		epos.block = dinfo->i_location;

		eloc.logicalBlockNum = block;

		eloc.partitionReferenceNum =

				dinfo->i_location.partitionReferenceNum;

		elen = dir->i_sb->s_blocksize;

		epos.offset = udf_file_entry_alloc_offset(dir);

		if (dinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT)

			epos.offset += sizeof(short_ad);

		else if (dinfo->i_alloc_type == ICBTAG_FLAG_AD_LONG)

			epos.offset += sizeof(long_ad);

		/* Load extent udf_expand_dir_adinicb() has created */

		udf_current_aext(dir, &epos, &eloc, &elen, 1);

	}



	if (sb->s_blocksize - fibh->eoffset >= nfidlen) {