Skip to contentSkip to conversation

fs: zfs: fix illegal use of fp

PATCH New Alejandro Mery 3 participants 3 messages Oct 31, 2012 – Nov 14, 2012

lore
Share & tools
lore

Alejandro Mery

author
#0 lore raw

PATCH 1/1 fs: zfs: fix illegal use of fp

the upcoming sunxi (allwinner a10/a13) platform enables zfs by default, and using linaro's hf -msoft-float makes the build fail because this u64 division.

Signed-off-by Alejandro Mery <[email protected]>
---
 fs/zfs/zfs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
fs/zfs/zfs.c +3 -1
index 360f723..ff857ae 100644
@@ -30,6 +30,7 @@
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include "zfs_common.h"
+#include "div64.h"
 
 block_dev_desc_t *zfs_dev_desc;
 

@@ -2158,7 +2159,8 @@ zfs_read(zfs_file_t file, char *buf, uint64_t len)
 		/*
 		 * Find requested blkid and the offset within that block.
 		 */
-		uint64_t blkid = (file->offset + red) /	 blksz;
+		uint64_t blkid = file->offset + red;
+		blkid = do_div(blkid, blksz);
 		free(data->file_buf);
 		data->file_buf = 0;
Signature · 1 line
1.7.12.3
Applied
#2 lore raw

PATCH 1/1 fs: zfs: fix illegal use of fp

In reply to Alejandro Mery

Hi,

Quoted 8 lines · On Wed, 31 Oct 2012 19:21:33 +0100 Alejandro Mery <[email protected]> wrote:

the upcoming sunxi (allwinner a10/a13) platform enables zfs by default, and using linaro's hf -msoft-float makes the build fail because this u64 division.

Signed-off-by Alejandro Mery <[email protected]>
---
 fs/zfs/zfs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Applied to staging/agust at denx.de, thanks!

Anatolij