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

Commit c72225ea authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

udf: Remove pointless union in udf_inode_info 



[ Upstream commit 382a2287bf9cd283206764572f66ab12657218aa ]

We use only a single member out of the i_ext union in udf_inode_info.
Just remove the pointless union.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Stable-dep-of: fc8033a34a3c ("udf: Preserve link count of system files")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6da42219

fs/udf/directory.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos, 
	fibh->soffset = fibh->eoffset;



	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {

		fi = udf_get_fileident(iinfo->i_ext.i_data -

		fi = udf_get_fileident(iinfo->i_data -

				       (iinfo->i_efe ?

					sizeof(struct extendedFileEntry) :

					sizeof(struct fileEntry)),

fs/udf/file.c

+3 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void __udf_adinicb_readpage(struct page *page) 
	 * So just sample it once and use the same value everywhere.

	 */

	kaddr = kmap_atomic(page);

	memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, isize);

	memcpy(kaddr, iinfo->i_data + iinfo->i_lenEAttr, isize);

	memset(kaddr + isize, 0, PAGE_SIZE - isize);

	flush_dcache_page(page);

	SetPageUptodate(page);
@@ -76,8 +76,7 @@ static int udf_adinicb_writepage(struct page *page, 
	BUG_ON(!PageLocked(page));



	kaddr = kmap_atomic(page);

	memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,

		i_size_read(inode));

	memcpy(iinfo->i_data + iinfo->i_lenEAttr, kaddr, i_size_read(inode));

	SetPageUptodate(page);

	kunmap_atomic(kaddr);

	mark_inode_dirty(inode);
@@ -213,7 +212,7 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		return put_user(UDF_I(inode)->i_lenEAttr, (int __user *)arg);

	case UDF_GETEABLOCK:

		return copy_to_user((char __user *)arg,

				    UDF_I(inode)->i_ext.i_data,

				    UDF_I(inode)->i_data,

				    UDF_I(inode)->i_lenEAttr) ? -EFAULT : 0;

	default:

		return -ENOIOCTLCMD;

fs/udf/ialloc.c

+7 −7
Original line number Diff line number Diff line
@@ -67,16 +67,16 @@ struct inode *udf_new_inode(struct inode *dir, umode_t mode) 
		iinfo->i_efe = 1;

		if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev)

			sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE;

		iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -

		iinfo->i_data = kzalloc(inode->i_sb->s_blocksize -

					sizeof(struct extendedFileEntry),

					GFP_KERNEL);

	} else {

		iinfo->i_efe = 0;

		iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -

		iinfo->i_data = kzalloc(inode->i_sb->s_blocksize -

					sizeof(struct fileEntry),

					GFP_KERNEL);

	}

	if (!iinfo->i_ext.i_data) {

	if (!iinfo->i_data) {

		iput(inode);

		return ERR_PTR(-ENOMEM);

	}

fs/udf/inode.c

+17 −19
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ void udf_evict_inode(struct inode *inode) 
	truncate_inode_pages_final(&inode->i_data);

	invalidate_inode_buffers(inode);

	clear_inode(inode);

	kfree(iinfo->i_ext.i_data);

	iinfo->i_ext.i_data = NULL;

	kfree(iinfo->i_data);

	iinfo->i_data = NULL;

	udf_clear_extent_cache(inode);

	if (want_delete) {

		udf_free_inode(inode);
@@ -278,14 +278,14 @@ int udf_expand_file_adinicb(struct inode *inode) 
		kaddr = kmap_atomic(page);

		memset(kaddr + iinfo->i_lenAlloc, 0x00,

		       PAGE_SIZE - iinfo->i_lenAlloc);

		memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr,

		memcpy(kaddr, iinfo->i_data + iinfo->i_lenEAttr,

			iinfo->i_lenAlloc);

		flush_dcache_page(page);

		SetPageUptodate(page);

		kunmap_atomic(kaddr);

	}

	down_write(&iinfo->i_data_sem);

	memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0x00,

	memset(iinfo->i_data + iinfo->i_lenEAttr, 0x00,

	       iinfo->i_lenAlloc);

	iinfo->i_lenAlloc = 0;

	if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_SHORT_AD))
@@ -303,8 +303,7 @@ int udf_expand_file_adinicb(struct inode *inode) 
		lock_page(page);

		down_write(&iinfo->i_data_sem);

		kaddr = kmap_atomic(page);

		memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,

		       inode->i_size);

		memcpy(iinfo->i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);

		kunmap_atomic(kaddr);

		unlock_page(page);

		iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
@@ -392,8 +391,7 @@ struct buffer_head *udf_expand_dir_adinicb(struct inode *inode, 
	}

	mark_buffer_dirty_inode(dbh, inode);



	memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0,

		iinfo->i_lenAlloc);

	memset(iinfo->i_data + iinfo->i_lenEAttr, 0, iinfo->i_lenAlloc);

	iinfo->i_lenAlloc = 0;

	eloc.logicalBlockNum = *block;

	eloc.partitionReferenceNum =
@@ -1241,7 +1239,7 @@ int udf_setsize(struct inode *inode, loff_t newsize) 
		if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {

			down_write(&iinfo->i_data_sem);

			udf_clear_extent_cache(inode);

			memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr + newsize,

			memset(iinfo->i_data + iinfo->i_lenEAttr + newsize,

			       0x00, bsize - newsize -

			       udf_file_entry_alloc_offset(inode));

			iinfo->i_lenAlloc = newsize;
@@ -1390,7 +1388,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
					sizeof(struct extendedFileEntry));

		if (ret)

			goto out;

		memcpy(iinfo->i_ext.i_data,

		memcpy(iinfo->i_data,

		       bh->b_data + sizeof(struct extendedFileEntry),

		       bs - sizeof(struct extendedFileEntry));

	} else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_FE)) {
@@ -1399,7 +1397,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
		ret = udf_alloc_i_data(inode, bs - sizeof(struct fileEntry));

		if (ret)

			goto out;

		memcpy(iinfo->i_ext.i_data,

		memcpy(iinfo->i_data,

		       bh->b_data + sizeof(struct fileEntry),

		       bs - sizeof(struct fileEntry));

	} else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_USE)) {
@@ -1412,7 +1410,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
					sizeof(struct unallocSpaceEntry));

		if (ret)

			goto out;

		memcpy(iinfo->i_ext.i_data,

		memcpy(iinfo->i_data,

		       bh->b_data + sizeof(struct unallocSpaceEntry),

		       bs - sizeof(struct unallocSpaceEntry));

		return 0;
@@ -1591,8 +1589,8 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
static int udf_alloc_i_data(struct inode *inode, size_t size)

{

	struct udf_inode_info *iinfo = UDF_I(inode);

	iinfo->i_ext.i_data = kmalloc(size, GFP_KERNEL);

	if (!iinfo->i_ext.i_data)

	iinfo->i_data = kmalloc(size, GFP_KERNEL);

	if (!iinfo->i_data)

		return -ENOMEM;

	return 0;

}
@@ -1666,7 +1664,7 @@ static int udf_update_inode(struct inode *inode, int do_sync) 


		use->lengthAllocDescs = cpu_to_le32(iinfo->i_lenAlloc);

		memcpy(bh->b_data + sizeof(struct unallocSpaceEntry),

		       iinfo->i_ext.i_data, inode->i_sb->s_blocksize -

		       iinfo->i_data, inode->i_sb->s_blocksize -

					sizeof(struct unallocSpaceEntry));

		use->descTag.tagIdent = cpu_to_le16(TAG_IDENT_USE);

		crclen = sizeof(struct unallocSpaceEntry);
@@ -1735,7 +1733,7 @@ static int udf_update_inode(struct inode *inode, int do_sync) 


	if (iinfo->i_efe == 0) {

		memcpy(bh->b_data + sizeof(struct fileEntry),

		       iinfo->i_ext.i_data,

		       iinfo->i_data,

		       inode->i_sb->s_blocksize - sizeof(struct fileEntry));

		fe->logicalBlocksRecorded = cpu_to_le64(lb_recorded);
@@ -1754,7 +1752,7 @@ static int udf_update_inode(struct inode *inode, int do_sync) 
		crclen = sizeof(struct fileEntry);

	} else {

		memcpy(bh->b_data + sizeof(struct extendedFileEntry),

		       iinfo->i_ext.i_data,

		       iinfo->i_data,

		       inode->i_sb->s_blocksize -

					sizeof(struct extendedFileEntry));

		efe->objectSize =
@@ -2050,7 +2048,7 @@ void udf_write_aext(struct inode *inode, struct extent_position *epos, 
	struct udf_inode_info *iinfo = UDF_I(inode);



	if (!epos->bh)

		ptr = iinfo->i_ext.i_data + epos->offset -

		ptr = iinfo->i_data + epos->offset -

			udf_file_entry_alloc_offset(inode) +

			iinfo->i_lenEAttr;

	else
@@ -2142,7 +2140,7 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos, 
	if (!epos->bh) {

		if (!epos->offset)

			epos->offset = udf_file_entry_alloc_offset(inode);

		ptr = iinfo->i_ext.i_data + epos->offset -

		ptr = iinfo->i_data + epos->offset -

			udf_file_entry_alloc_offset(inode) +

			iinfo->i_lenEAttr;

		alen = udf_file_entry_alloc_offset(inode) +

fs/udf/misc.c

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size, 
	uint16_t crclen;

	struct udf_inode_info *iinfo = UDF_I(inode);



	ea = iinfo->i_ext.i_data;

	ea = iinfo->i_data;

	if (iinfo->i_lenEAttr) {

		ad = iinfo->i_ext.i_data + iinfo->i_lenEAttr;

		ad = iinfo->i_data + iinfo->i_lenEAttr;

	} else {

		ad = ea;

		size += sizeof(struct extendedAttrHeaderDesc);
@@ -153,7 +153,7 @@ struct genericFormat *udf_get_extendedattr(struct inode *inode, uint32_t type, 
	uint32_t offset;

	struct udf_inode_info *iinfo = UDF_I(inode);



	ea = iinfo->i_ext.i_data;

	ea = iinfo->i_data;



	if (iinfo->i_lenEAttr) {

		struct extendedAttrHeaderDesc *eahd;