From: liubo <liubo2009@cn.fujitsu.com>
To: Linux Btrfs <linux-btrfs@vger.kernel.org>
Subject: [PATCH] Btrfs: fix compile warning from __btrfs_map_block
Date: Thu, 31 Mar 2011 17:45:20 +0800 [thread overview]
Message-ID: <4D944D30.4050900@cn.fujitsu.com> (raw)
In-Reply-To: <4D944235.7020408@cn.fujitsu.com>
While compile btrfs modules on 32bit box, I encounter the following:
WARNING: "__umoddi3" [fs/btrfs/btrfs.ko] undefined!
The WARNING comes from that __btrfs_map_block does not use do_div() for
relative operations, this will cause problems on 32bit box, for values
with "u64" type should use do_div() instead of a direct "%".
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
---
fs/btrfs/volumes.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 41afd50..7b23d0f 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3076,16 +3076,19 @@ again:
multi->stripes[i].dev = map->stripes[stripe_index].dev;
if (map->type & BTRFS_BLOCK_GROUP_RAID0) {
- u64 stripes;
- int last_stripe = (stripe_nr_end - 1) %
- map->num_stripes;
+ u64 stripes = stripe_nr_end - 1;
+ int last_stripe = do_div(stripes,
+ map->num_stripes);
int j;
for (j = 0; j < map->num_stripes; j++) {
- if ((stripe_nr_end - 1 - j) %
- map->num_stripes == stripe_index)
+ stripes = stripe_nr_end - 1 - j;
+
+ if (do_div(stripes, map->num_stripes) ==
+ stripe_index)
break;
}
+
stripes = stripe_nr_end - 1 - j;
do_div(stripes, map->num_stripes);
multi->stripes[i].length = map->stripe_len *
@@ -3100,18 +3103,22 @@ again:
multi->stripes[i].length -=
stripe_end_offset;
} else if (map->type & BTRFS_BLOCK_GROUP_RAID10) {
- u64 stripes;
+ u64 stripes = stripe_nr_end - 1;
int j;
int factor = map->num_stripes /
map->sub_stripes;
- int last_stripe = (stripe_nr_end - 1) % factor;
+ int last_stripe = do_div(stripes, factor);
+
last_stripe *= map->sub_stripes;
for (j = 0; j < factor; j++) {
- if ((stripe_nr_end - 1 - j) % factor ==
+ stripes = stripe_nr_end - 1 - j;
+
+ if (do_div(stripes, factor) ==
stripe_index / map->sub_stripes)
break;
}
+
stripes = stripe_nr_end - 1 - j;
do_div(stripes, factor);
multi->stripes[i].length = map->stripe_len *
--
1.6.5.2
next parent reply other threads:[~2011-03-31 9:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4D944235.7020408@cn.fujitsu.com>
2011-03-31 9:45 ` liubo [this message]
2011-03-31 12:10 ` [PATCH] Btrfs: fix compile warning from __btrfs_map_block Chris Mason
2011-04-01 0:46 ` liubo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D944D30.4050900@cn.fujitsu.com \
--to=liubo2009@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.