From f0a982042d544433627fb5fc6005ad4d4d879e20 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Mon, 22 Jun 2009 10:12:14 +0100
Subject: [PATCH] --- yaml --- r: 154239 b: refs/heads/master c:
 5657e8fa45cf230df278040c420fb80e06309d8f h: refs/heads/master i:   154237:
 bb6e2f042de22b806d4d3b81686abc4b99d82434   154235:
 72040fe06564b7eb228a66eeaa9bd7eb9c9c805c   154231:
 ccc33227b67091e6028df9c4824c2f68489c03b5   154223:
 59b8192d9764ae220eaf5007fc38cd64627a311a   154207:
 25a0816e6b357ab34cb6feb354278f0c1eb33699   154175:
 dced0a757d4f6d054c1ce86826bf4b90a2812da3   154111:
 51a4ebf1ce62f2681a7a73c1373fd125a609a339 v: v3

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

diff --git a/[refs] b/[refs]
index df54a6e868e6..181fb4f4387d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cbeb67ad50f7d68e5e83be2cb2284de8f9c03b5
+refs/heads/master: 5657e8fa45cf230df278040c420fb80e06309d8f
diff --git a/trunk/drivers/md/dm-exception-store.h b/trunk/drivers/md/dm-exception-store.h
index c92701dc5001..2442c8c07898 100644
--- a/trunk/drivers/md/dm-exception-store.h
+++ b/trunk/drivers/md/dm-exception-store.h
@@ -156,7 +156,7 @@ static inline void dm_consecutive_chunk_count_inc(struct dm_snap_exception *e)
  */
 static inline sector_t get_dev_size(struct block_device *bdev)
 {
-	return bdev->bd_inode->i_size >> SECTOR_SHIFT;
+	return i_size_read(bdev->bd_inode) >> SECTOR_SHIFT;
 }
 
 static inline chunk_t sector_to_chunk(struct dm_exception_store *store,
diff --git a/trunk/drivers/md/dm-log.c b/trunk/drivers/md/dm-log.c
index 6fa8ccf91c70..6352a9ad4446 100644
--- a/trunk/drivers/md/dm-log.c
+++ b/trunk/drivers/md/dm-log.c
@@ -416,7 +416,7 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
 				       bitset_size,
 				       ti->limits.logical_block_size);
 
-		if (buf_size > dev->bdev->bd_inode->i_size) {
+		if (buf_size > i_size_read(dev->bdev->bd_inode)) {
 			DMWARN("log device %s too small: need %llu bytes",
 				dev->name, (unsigned long long)buf_size);
 			kfree(lc);
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index e9a73bb242b0..0e2210c0c168 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -388,7 +388,8 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)
 static int check_device_area(struct dm_dev_internal *dd, sector_t start,
 			     sector_t len)
 {
-	sector_t dev_size = dd->dm_dev.bdev->bd_inode->i_size >> SECTOR_SHIFT;
+	sector_t dev_size = i_size_read(dd->dm_dev.bdev->bd_inode) >>
+			    SECTOR_SHIFT;
 
 	if (!dev_size)
 		return 1;