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

Commit 79144954 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Remove repeated loads blocksize 



Store blocksize in a local variable in udf_fill_inode() since it is used
a lot of times.

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

fs/udf/inode.c

+8 −11
Original line number Diff line number Diff line
@@ -1288,6 +1288,7 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) 
	struct kernel_lb_addr *iloc = &iinfo->i_location;

	unsigned int link_count;

	unsigned int indirections = 0;

	int bs = inode->i_sb->s_blocksize;

	int ret = -EIO;



reread:
@@ -1374,38 +1375,35 @@ reread: 
	if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_EFE)) {

		iinfo->i_efe = 1;

		iinfo->i_use = 0;

		ret = udf_alloc_i_data(inode, inode->i_sb->s_blocksize -

		ret = udf_alloc_i_data(inode, bs -

					sizeof(struct extendedFileEntry));

		if (ret)

			goto out;

		memcpy(iinfo->i_ext.i_data,

		       bh->b_data + sizeof(struct extendedFileEntry),

		       inode->i_sb->s_blocksize -

					sizeof(struct extendedFileEntry));

		       bs - sizeof(struct extendedFileEntry));

	} else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_FE)) {

		iinfo->i_efe = 0;

		iinfo->i_use = 0;

		ret = udf_alloc_i_data(inode, inode->i_sb->s_blocksize -

						sizeof(struct fileEntry));

		ret = udf_alloc_i_data(inode, bs - sizeof(struct fileEntry));

		if (ret)

			goto out;

		memcpy(iinfo->i_ext.i_data,

		       bh->b_data + sizeof(struct fileEntry),

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

		       bs - sizeof(struct fileEntry));

	} else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_USE)) {

		iinfo->i_efe = 0;

		iinfo->i_use = 1;

		iinfo->i_lenAlloc = le32_to_cpu(

				((struct unallocSpaceEntry *)bh->b_data)->

				 lengthAllocDescs);

		ret = udf_alloc_i_data(inode, inode->i_sb->s_blocksize -

		ret = udf_alloc_i_data(inode, bs -

					sizeof(struct unallocSpaceEntry));

		if (ret)

			goto out;

		memcpy(iinfo->i_ext.i_data,

		       bh->b_data + sizeof(struct unallocSpaceEntry),

		       inode->i_sb->s_blocksize -

					sizeof(struct unallocSpaceEntry));

		       bs - sizeof(struct unallocSpaceEntry));

		return 0;

	}
@@ -1498,8 +1496,7 @@ reread: 
		if (iinfo->i_lenAlloc != inode->i_size)

			goto out;

		/* File in ICB has to fit in there... */

		if (inode->i_size > inode->i_sb->s_blocksize -

					udf_file_entry_alloc_offset(inode))

		if (inode->i_size > bs - udf_file_entry_alloc_offset(inode))

			goto out;

	}