Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nfs: fix a minor do_div portability issue

Browse source 
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>
This commit is contained in:
Chris Metcalf 2011-08-11 13:54:28 -07:00 committed by Trond Myklebust
parent 0b1c8fc43c
commit 3476f114ad
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/nfs/nfs4filelayout.c
View file

@ -49,13 +49,14 @@ filelayout_get_dense_offset(struct nfs4_filelayout_segment *flseg,
loff_t offset) loff_t offset)
{ {
u32 stripe_width = flseg->stripe_unit * flseg->dsaddr->stripe_count; u32 stripe_width = flseg->stripe_unit * flseg->dsaddr->stripe_count;
u64 tmp; u64 stripe_no;
u32 rem;
offset -= flseg->pattern_offset; offset -= flseg->pattern_offset;
tmp = offset; stripe_no = div_u64(offset, stripe_width);
do_div(tmp, stripe_width); div_u64_rem(offset, flseg->stripe_unit, &rem);
return tmp * flseg->stripe_unit + do_div(offset, flseg->stripe_unit); return stripe_no * flseg->stripe_unit + rem;
} }
/* This function is used by the layout driver to calculate the /* This function is used by the layout driver to calculate the