| Message ID | 1401375457.6543.1.camel@leira.trondhjem.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks great, thanks for taking care of that while I was on vacation! -dros On May 29, 2014, at 10:57 AM, Trond Myklebust <trond.myklebust@primarydata.com> wrote: > On Thu, 2014-05-29 at 22:35 +0800, kbuild test robot wrote: >> tree: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git devel >> head: c75c3b0bfffdb21daecb7dadbd30eb2e353fe66d >> commit: fa1165eda0eeaee57c292df3af1c98e10223f0f5 [41/48] pnfs: filelayout: support non page aligned layouts >> config: make ARCH=arm kzm9g_defconfig >> >> All error/warnings: >> >> fs/built-in.o: In function `filelayout_pg_test': >>>> nls_iso8859-1.c:(.text+0x9cf3c): undefined reference to `__aeabi_uldivmod' >> >> --- >> 0-DAY kernel build testing backend Open Source Technology Center >> http://lists.01.org/mailman/listinfo/kbuild Intel Corporation > > Hi Dros, > > I'm applying the following patch to fix this up: > > From 64060d5dd6bf8d6d611c342f9a42a2ad7640ed4a Mon Sep 17 00:00:00 2001 > From: Trond Myklebust <trond.myklebust@primarydata.com> > Date: Thu, 29 May 2014 10:49:12 -0400 > Subject: [PATCH] fixup! pnfs: filelayout: support non page aligned layouts > > --- > fs/nfs/nfs4filelayout.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c > index 9419061b6d1b..63a16375660a 100644 > --- a/fs/nfs/nfs4filelayout.c > +++ b/fs/nfs/nfs4filelayout.c > @@ -950,7 +950,9 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, > } > > /* calculate remaining bytes in the current stripe */ > - stripe_offset = ((u64)req_offset(req) - segment_offset) % stripe_unit; > + div_u64_rem((u64)req_offset(req) - segment_offset, > + stripe_unit, > + &stripe_offset); > WARN_ON_ONCE(stripe_offset > stripe_unit); > if (stripe_offset >= stripe_unit) > return 0; > -- > 1.9.3 > > > > -- > Trond Myklebust > Linux NFS client maintainer, PrimaryData > trond.myklebust@primarydata.com > > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 9419061b6d1b..63a16375660a 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -950,7 +950,9 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, } /* calculate remaining bytes in the current stripe */ - stripe_offset = ((u64)req_offset(req) - segment_offset) % stripe_unit; + div_u64_rem((u64)req_offset(req) - segment_offset, + stripe_unit, + &stripe_offset); WARN_ON_ONCE(stripe_offset > stripe_unit); if (stripe_offset >= stripe_unit) return 0;