]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
fs: fat: fix link error when building with DEBUG=1
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Mon, 25 Feb 2019 18:42:48 +0000 (19:42 +0100)
committerTom Rini <trini@konsulko.com>
Thu, 28 Feb 2019 19:21:46 +0000 (14:21 -0500)
When compiling with DEBUG=1 an error
fs/fat/fat_write.c:831: undefined reference to `__aeabi_ldivmod'
occurred.

We should use do_div() instead of the modulus operator.

filesize and cur_pos cannot be negative. So let's use u64 to avoid
warnings.

Fixes: cb8af8af5ba0 ("fs: fat: support write with non-zero offset")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
fs/fat/fat_write.c

index 3272412ca9f3084a50f2ada8f01efa449c1930ee..852f874e58171c82b0e950fa46cde9922aa1887e 100644 (file)
@@ -696,11 +696,11 @@ static int
 set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
             loff_t maxsize, loff_t *gotsize)
 {
-       loff_t filesize;
        unsigned int bytesperclust = mydata->clust_size * mydata->sect_size;
        __u32 curclust = START(dentptr);
        __u32 endclust = 0, newclust = 0;
-       loff_t cur_pos, offset, actsize, wsize;
+       u64 cur_pos, filesize;
+       loff_t offset, actsize, wsize;
 
        *gotsize = 0;
        filesize = pos + maxsize;
@@ -828,7 +828,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
 
        curclust = endclust;
        filesize -= cur_pos;
-       assert(!(cur_pos % bytesperclust));
+       assert(!do_div(cur_pos, bytesperclust));
 
 set_clusters:
        /* allocate and write */