aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-11-11 16:41:04 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:19:13 -0500
commit4896e8c1b8fb7e46a65a6676e271fc047a260a3e (patch)
treeac06646292c04907e9cca866a2d8d81b7a92fa83 /drivers/block
parent1816a2b47afae838e53a177d5d166cc7be97d6b5 (diff)
drbd: restore compatibility with 32bit kernels
With commit drbd: further converge progress display of resync and online-verify accidentally an u64/u64 div was introduced, causing an unresolvable symbol __udivdi3 to be reference. Actually for that division, 32bit are still suficient for now, so we can revert to unsigned long instead. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_proc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 329b66a91e44..49d817cfe865 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -164,8 +164,8 @@ static void drbd_syncer_progress(struct drbd_conf *mdev, struct seq_file *seq)
164 if (proc_details >= 1) { 164 if (proc_details >= 1) {
165 /* 64 bit: 165 /* 64 bit:
166 * we convert to sectors in the display below. */ 166 * we convert to sectors in the display below. */
167 u64 bm_bits = drbd_bm_bits(mdev); 167 unsigned long bm_bits = drbd_bm_bits(mdev);
168 u64 bit_pos; 168 unsigned long bit_pos;
169 if (mdev->state.conn == C_VERIFY_S || 169 if (mdev->state.conn == C_VERIFY_S ||
170 mdev->state.conn == C_VERIFY_T) 170 mdev->state.conn == C_VERIFY_T)
171 bit_pos = bm_bits - mdev->ov_left; 171 bit_pos = bm_bits - mdev->ov_left;
@@ -176,8 +176,8 @@ static void drbd_syncer_progress(struct drbd_conf *mdev, struct seq_file *seq)
176 seq_printf(seq, 176 seq_printf(seq,
177 "\t%3d%% sector pos: %llu/%llu\n", 177 "\t%3d%% sector pos: %llu/%llu\n",
178 (int)(bit_pos / (bm_bits/100+1)), 178 (int)(bit_pos / (bm_bits/100+1)),
179 (unsigned long long) BM_BIT_TO_SECT(bit_pos), 179 (unsigned long long)bit_pos * BM_SECT_PER_BIT,
180 (unsigned long long) BM_BIT_TO_SECT(bm_bits)); 180 (unsigned long long)bm_bits * BM_SECT_PER_BIT);
181 } 181 }
182} 182}
183 183