From: Liu Bo <liubo2009@cn.fujitsu.com>
To: <linux-kernel@vger.kernel.org>
Cc: <torvalds@linux-foundation.org>, <mingo@kernel.org>,
<jwboyer@gmail.com>, <josef@redhat.com>,
<linux-btrfs@vger.kernel.org>, <chris.mason@oracle.com>,
<dave@jikos.cz>
Subject: [PATCH v2] Btrfs: use do_div to avoid compile errors on 32bit box
Date: Sat, 20 Aug 2011 10:17:47 +0800 [thread overview]
Message-ID: <1313806667-30495-1-git-send-email-liubo2009@cn.fujitsu.com> (raw)
When doing div operation of u64 type, we need to be careful and use do_div
to avoid compile ERROR on 32bit box:
"ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
make[1]: *** [__modpost] Error 1
v1->v2:
- fix stupid do_div() with type "signed integer".
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
---
fs/btrfs/extent-tree.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 80d6148..e43e4f1 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6735,9 +6735,10 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
struct btrfs_device *device;
u64 min_free;
+ u32 dev_min = 1;
+ u32 dev_nr = 0;
+ u32 dup = 2;
int index;
- int dev_nr = 0;
- int dev_min = 1;
int full = 0;
int ret = 0;
@@ -6796,14 +6797,14 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
index = get_block_group_index(block_group);
if (index == 0) {
dev_min = 4;
- min_free /= 2;
+ do_div(min_free, dup);
} else if (index == 1) {
dev_min = 2;
} else if (index == 2) {
- min_free *= 2;
+ min_free *= dup;
} else if (index == 3) {
dev_min = fs_devices->rw_devices;
- min_free /= dev_min;
+ do_div(min_free, dev_min);
}
mutex_lock(&root->fs_info->chunk_mutex);
--
1.6.5.2
next reply other threads:[~2011-08-20 2:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-20 2:17 Liu Bo [this message]
2011-08-20 12:21 ` [PATCH v2] Btrfs: use do_div to avoid compile errors on 32bit box Josef Bacik
2011-08-21 1:04 ` Linus Torvalds
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=1313806667-30495-1-git-send-email-liubo2009@cn.fujitsu.com \
--to=liubo2009@cn.fujitsu.com \
--cc=chris.mason@oracle.com \
--cc=dave@jikos.cz \
--cc=josef@redhat.com \
--cc=jwboyer@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).