From 5ea473ebf6d6cf14265600e24dfe6f712a04cd44 Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Mon, 22 Jun 2009 10:12:33 +0100
Subject: [PATCH] --- yaml --- r: 154271 b: refs/heads/master c:
 18d8594dd93a1ae2fafd591ec026e87d743292bf h: refs/heads/master i:   154269:
 c8487744638275ffb05b792fa36ee455cd8f342d   154267:
 2c6e5d2f6df537180872594e74c9e0fb89452bb9   154263:
 c38549a3e1f7536dc24cd665a32c4a8d97491ec5   154255:
 fef4f9827cd21115a4c185cf446918544ca675a8   154239:
 f0a982042d544433627fb5fc6005ad4d4d879e20 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/dm-log.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c18a94f8a3bc..06bcfe4d01b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af4874e03ed82f050d5872d8c39ce64bf16b5c38
+refs/heads/master: 18d8594dd93a1ae2fafd591ec026e87d743292bf
diff --git a/trunk/drivers/md/dm-log.c b/trunk/drivers/md/dm-log.c
index 6352a9ad4446..9443896ede07 100644
--- a/trunk/drivers/md/dm-log.c
+++ b/trunk/drivers/md/dm-log.c
@@ -412,9 +412,10 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
 		/*
 		 * Buffer holds both header and bitset.
 		 */
-		buf_size = dm_round_up((LOG_OFFSET << SECTOR_SHIFT) +
-				       bitset_size,
-				       ti->limits.logical_block_size);
+		buf_size =
+		    dm_round_up((LOG_OFFSET << SECTOR_SHIFT) + bitset_size,
+				bdev_logical_block_size(lc->header_location.
+							    bdev));
 
 		if (buf_size > i_size_read(dev->bdev->bd_inode)) {
 			DMWARN("log device %s too small: need %llu bytes",