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

Commit 89a4d970 authored Oct 12, 2017 by Steve Magnani Committed by Jan Kara Oct 17, 2017

udf: Fix some sign-conversion warnings



Fix some warnings that appear when compiling with -Wconversion.
A sub-optimal choice of variable type leads to warnings about
conversion in both directions between unsigned and signed.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: Jan Kara <jack@suse.cz>

parent fcbf7637

fs/udf/directory.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ struct fileIdentDesc udf_fileident_read(struct inode dir, loff_t *nf_pos,
		}

		if (fibh->eoffset == dir->i_sb->s_blocksize) {
		int lextoffset = epos->offset;
		uint32_t lextoffset = epos->offset;
		unsigned char blocksize_bits = dir->i_sb->s_blocksize_bits;

		if (udf_next_aext(dir, epos, eloc, elen, 1) !=
		@@ -111,7 +111,7 @@ struct fileIdentDesc udf_fileident_read(struct inode dir, loff_t *nf_pos,
		memcpy((uint8_t )cfi, (uint8_t )fi,
		sizeof(struct fileIdentDesc));
		} else if (fibh->eoffset > dir->i_sb->s_blocksize) {
		int lextoffset = epos->offset;
		uint32_t lextoffset = epos->offset;

		if (udf_next_aext(dir, epos, eloc, elen, 1) !=
		(EXT_RECORDED_ALLOCATED >> 30))

fs/udf/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ static int udf_do_extend_file(struct inode *inode,
		int count = 0, fake = !(last_ext->extLength & UDF_EXTENT_LENGTH_MASK);
		struct super_block *sb = inode->i_sb;
		struct kernel_lb_addr prealloc_loc = {};
		int prealloc_len = 0;
		uint32_t prealloc_len = 0;
		struct udf_inode_info *iinfo;
		int err;

		@@ -1193,7 +1193,7 @@ int udf_setsize(struct inode *inode, loff_t newsize)
		{
		int err;
		struct udf_inode_info *iinfo;
		int bsize = i_blocksize(inode);
		unsigned int bsize = i_blocksize(inode);

		if (!(S_ISREG(inode->i_mode) \|\| S_ISDIR(inode->i_mode) \|\|
		S_ISLNK(inode->i_mode)))