From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Todd Poynor <toddpoynor@google.com>,
"Theodore Tso" <tytso@mit.edu>,
Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>,
Lukas Czerner <lczerner@redhat.com>
Subject: [ 06/19] ext4: fixup 64-bit divides in 3.0-stable backport of upstream fix
Date: Wed, 10 Apr 2013 15:50:29 -0700 [thread overview]
Message-ID: <20130410225027.476235073@linuxfoundation.org> (raw)
In-Reply-To: <20130410225026.833809117@linuxfoundation.org>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Todd Poynor <toddpoynor@google.com>
Replace C division operators with div64_u64 for divides introduced in:
commit 503f4bdcc078e7abee273a85ce322de81b18a224
ext4: use atomic64_t for the per-flexbg free_clusters count
Specific to the 3.0-stable backport of the upstream patch.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Reviewed-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
Cc: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/ext4/ialloc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
#include <linux/blkdev.h>
+#include <linux/math64.h>
#include <asm/byteorder.h>
#include "ext4.h"
@@ -356,7 +357,7 @@ static int find_group_flex(struct super_
find_close_to_parent:
flexbg_free_blocks = atomic64_read(&flex_group[best_flex].free_blocks);
- flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
+ flex_freeb_ratio = div64_u64(flexbg_free_blocks * 100, blocks_per_flex);
if (atomic_read(&flex_group[best_flex].free_inodes) &&
flex_freeb_ratio > free_block_ratio)
goto found_flexbg;
@@ -371,7 +372,7 @@ find_close_to_parent:
continue;
flexbg_free_blocks = atomic64_read(&flex_group[i].free_blocks);
- flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
+ flex_freeb_ratio = div64_u64(flexbg_free_blocks * 100, blocks_per_flex);
if (flex_freeb_ratio > free_block_ratio &&
(atomic_read(&flex_group[i].free_inodes))) {
next prev parent reply other threads:[~2013-04-10 22:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-10 22:50 [ 00/19] 3.0.73-stable review Greg Kroah-Hartman
2013-04-10 22:50 ` [ 01/19] ASoC: dma-sh7760: Fix compile error Greg Kroah-Hartman
2013-04-10 22:50 ` [ 02/19] UBIFS: make space fixup work in the remount case Greg Kroah-Hartman
2013-04-10 22:50 ` [ 03/19] reiserfs: Fix warning and inode leak when deleting inode with xattrs Greg Kroah-Hartman
2013-04-11 7:33 ` Pawel Zawora
2013-04-11 19:04 ` Greg Kroah-Hartman
2013-04-10 22:50 ` [ 04/19] ALSA: hda - bug fix on return value when getting HDMI ELD info Greg Kroah-Hartman
2013-04-10 22:50 ` [ 05/19] ALSA: hda - fix typo in proc output Greg Kroah-Hartman
2013-04-10 22:50 ` Greg Kroah-Hartman [this message]
2013-04-10 22:50 ` [ 07/19] libata: Use integer return value for atapi_command_packet_set Greg Kroah-Hartman
2013-04-10 22:50 ` [ 08/19] libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive Greg Kroah-Hartman
2013-04-10 22:50 ` [ 09/19] alpha: Add irongate_io to PCI bus resources Greg Kroah-Hartman
2013-04-10 22:50 ` [ 10/19] ftrace: Consistently restore trace function on sysctl enabling Greg Kroah-Hartman
2013-04-10 22:50 ` [ 11/19] powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test Greg Kroah-Hartman
2013-04-10 22:50 ` [ 12/19] spinlocks and preemption points need to be at least compiler barriers Greg Kroah-Hartman
2013-04-10 22:50 ` [ 13/19] crypto: gcm - fix assumption that assoc has one segment Greg Kroah-Hartman
2013-04-10 22:50 ` [ 14/19] block: avoid using uninitialized value in from queue_var_store Greg Kroah-Hartman
2013-04-10 22:50 ` [ 15/19] thermal: return an error on failure to register thermal class Greg Kroah-Hartman
2013-04-10 22:50 ` [ 16/19] mm: prevent mmap_cache race in find_vma() Greg Kroah-Hartman
2013-04-10 22:50 ` [ 17/19] x86-32, mm: Rip out x86_32 NUMA remapping code Greg Kroah-Hartman
2013-04-10 22:50 ` [ 18/19] Revert "mwifiex: cancel cmd timer and free curr_cmd in shutdown process Greg Kroah-Hartman
2013-04-10 22:50 ` [ 19/19] rt2x00: rt2x00pci_regbusy_read() - only print register access failure once Greg Kroah-Hartman
2013-04-11 16:29 ` [ 00/19] 3.0.73-stable review Shuah Khan
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=20130410225027.476235073@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=lczerner@redhat.com \
--cc=linux-kernel.bfrz@manchmal.in-ulm.de \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=toddpoynor@google.com \
--cc=tytso@mit.edu \
/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
Powered by JetHome