* [PATCH v2] pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe
@ 2014-09-18 21:15 Trond Myklebust
2014-09-18 23:39 ` Christoph Hellwig
2014-09-21 17:08 ` Christoph Hellwig
0 siblings, 2 replies; 3+ messages in thread
From: Trond Myklebust @ 2014-09-18 21:15 UTC (permalink / raw)
To: linux-nfs; +Cc: Christoph Hellwig, Stephen Rothwell
kbuild test robot reports:
fs/built-in.o: In function `bl_map_stripe':
>> :(.text+0x965b4): undefined reference to `__aeabi_uldivmod'
>> :(.text+0x965cc): undefined reference to `__aeabi_uldivmod'
>> :(.text+0x96604): undefined reference to `__aeabi_uldivmod'
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
v2: Include the calculation of disk_offset.
fs/nfs/blocklayout/dev.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c
index 00f159da06ee..5aed4f98df41 100644
--- a/fs/nfs/blocklayout/dev.c
+++ b/fs/nfs/blocklayout/dev.c
@@ -150,10 +150,13 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset,
struct pnfs_block_dev_map *map)
{
struct pnfs_block_dev *child;
- u64 chunk = (offset / dev->chunk_size);
- int chunk_idx = chunk % dev->nr_children;
+ u64 chunk;
+ u32 chunk_idx;
u64 disk_offset;
+ chunk = div_u64(offset, dev->chunk_size);
+ div_u64_rem(chunk, dev->nr_children, &chunk_idx);
+
if (chunk_idx > dev->nr_children) {
dprintk("%s: invalid chunk idx %d (%lld/%lld)\n",
__func__, chunk_idx, offset, dev->chunk_size);
@@ -165,7 +168,7 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset,
offset = chunk * dev->chunk_size;
/* disk offset of the stripe */
- disk_offset = offset / dev->nr_children;
+ disk_offset = div_u64(offset, dev->nr_children);
child = &dev->children[chunk_idx];
child->map(child, disk_offset, map);
--
1.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe
2014-09-18 21:15 [PATCH v2] pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe Trond Myklebust
@ 2014-09-18 23:39 ` Christoph Hellwig
2014-09-21 17:08 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2014-09-18 23:39 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-nfs, Christoph Hellwig, Stephen Rothwell
Looks good to me, but give me a quick break to run it through QA.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe
2014-09-18 21:15 [PATCH v2] pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe Trond Myklebust
2014-09-18 23:39 ` Christoph Hellwig
@ 2014-09-21 17:08 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2014-09-21 17:08 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-nfs, Stephen Rothwell
Works fine and passed QA:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-21 17:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-18 21:15 [PATCH v2] pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe Trond Myklebust
2014-09-18 23:39 ` Christoph Hellwig
2014-09-21 17:08 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox