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>

diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index ebed5c60982e1fb7e9bd34e2d8be25c562c5a40d..0a98a2369738fc2cff925c80066b92a58b299066 100644 (file)
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -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))

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 7d2a95c9d670b3d8eb44ef528867315b019ddcef..c23744d5ae5c44d61c5f00201118d2d28b657bbf 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -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)))