---

yaml --- r: 154239 b: refs/heads/master c: 5657e8f h: refs/heads/master i: 154237: bb6e2f0 154235: 72040fe 154231: ccc3322 154223: 59b8192 154207: 25a0816 154175: dced0a7 154111: 51a4ebf v: v3
git-mirror · Jun 22, 2009 · f0a9820 · f0a9820
1 parent bbea2be
commit f0a9820
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;