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 <[email protected]>
---
diff -uprN a/fs/udf/directory.c b/fs/udf/directory.c
--- a/fs/udf/directory.c        2017-10-07 16:46:37.694130197 -0500
+++ b/fs/udf/directory.c        2017-10-11 12:02:27.226674863 -0500
@@ -52,7 +52,7 @@ struct fileIdentDesc *udf_fileident_read
        }
 
        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
                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 -uprN a/fs/udf/inode.c b/fs/udf/inode.c
--- a/fs/udf/inode.c    2017-10-07 16:46:37.694130197 -0500
+++ b/fs/udf/inode.c    2017-10-11 12:49:03.972233635 -0500
@@ -480,7 +480,7 @@ static int udf_do_extend_file(struct ino
        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, lof
 {
        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)))

Reply via email to