Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3476f114addb7b96912840a234702f660a1f460b

Authored by Chris Metcalf
Committed by Trond Myklebust
1 parent 0b1c8fc43c
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

nfs: fix a minor do_div portability issue 

This change modifies filelayout_get_dense_offset() to use the functions
in math64.h and thus avoid a 32-bit platform compile error trying to
use do_div() on an s64 type.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Reviewed-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff

fs/nfs/nfs4filelayout.c
Diff comments   View file @ 3476f11
... ... @@ -49,13 +49,14 @@
49 49 loff_t offset)
50 50 {
51 51 u32 stripe_width = flseg->stripe_unit * flseg->dsaddr->stripe_count;
52   - u64 tmp;
  52 + u64 stripe_no;
  53 + u32 rem;
53 54  
54 55 offset -= flseg->pattern_offset;
55   - tmp = offset;
56   - do_div(tmp, stripe_width);
  56 + stripe_no = div_u64(offset, 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 62 /* This function is used by the layout driver to calculate the