aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/nfs4filelayout.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index a62d36b9a99e..71ec08617e23 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -49,13 +49,14 @@ filelayout_get_dense_offset(struct nfs4_filelayout_segment *flseg,
49 loff_t offset) 49 loff_t offset)
50{ 50{
51 u32 stripe_width = flseg->stripe_unit * flseg->dsaddr->stripe_count; 51 u32 stripe_width = flseg->stripe_unit * flseg->dsaddr->stripe_count;
52 u64 tmp; 52 u64 stripe_no;
53 u32 rem;
53 54
54 offset -= flseg->pattern_offset; 55 offset -= flseg->pattern_offset;
55 tmp = offset; 56 stripe_no = div_u64(offset, stripe_width);
56 do_div(tmp, stripe_width); 57 div_u64_rem(offset, flseg->stripe_unit, &rem);
57 58
58 return tmp * flseg->stripe_unit + do_div(offset, flseg->stripe_unit); 59 return stripe_no * flseg->stripe_unit + rem;
59} 60}
60 61
61/* This function is used by the layout driver to calculate the 62/* This function is used by the layout driver to calculate the