projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
fs
/
zfs
/
zfs.c
diff --git
a/fs/zfs/zfs.c
b/fs/zfs/zfs.c
index
2db45b1
..
1b73244
100644
(file)
--- a/
fs/zfs/zfs.c
+++ b/
fs/zfs/zfs.c
@@
-30,6
+30,7
@@
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include "zfs_common.h"
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include "zfs_common.h"
+#include "div64.h"
block_dev_desc_t *zfs_dev_desc;
block_dev_desc_t *zfs_dev_desc;
@@
-2115,7
+2116,8
@@
zfs_read(zfs_file_t file, char *buf, uint64_t len)
/*
* Find requested blkid and the offset within that block.
*/
/*
* 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;
free(data->file_buf);
data->file_buf = 0;