projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.37/drivers' into for-linus
[cascardo/linux.git]
/
drivers
/
block
/
drbd
/
drbd_int.h
diff --git
a/drivers/block/drbd/drbd_int.h
b/drivers/block/drbd/drbd_int.h
index
c68dc29
..
1ea1a34
100644
(file)
--- a/
drivers/block/drbd/drbd_int.h
+++ b/
drivers/block/drbd/drbd_int.h
@@
-1862,7
+1862,7
@@
static inline sector_t drbd_md_last_sector(struct drbd_backing_dev *bdev)
static inline sector_t drbd_get_capacity(struct block_device *bdev)
{
/* return bdev ? get_capacity(bdev->bd_disk) : 0; */
- return bdev ?
bdev->bd_inode->i_size
>> 9 : 0;
+ return bdev ?
i_size_read(bdev->bd_inode)
>> 9 : 0;
}
/**