git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: read i_size with i_size_read()
[pandora-kernel.git]
/
block
/
ioctl.c
diff --git
a/block/ioctl.c
b/block/ioctl.c
index
d724ceb
..
38aa194
100644
(file)
--- a/
block/ioctl.c
+++ b/
block/ioctl.c
@@
-125,7
+125,7
@@
static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
start >>= 9;
len >>= 9;
start >>= 9;
len >>= 9;
- if (start + len > (
bdev->bd_inode->i_size
>> 9))
+ if (start + len > (
i_size_read(bdev->bd_inode)
>> 9))
return -EINVAL;
if (secure)
flags |= BLKDEV_DISCARD_SECURE;
return -EINVAL;
if (secure)
flags |= BLKDEV_DISCARD_SECURE;
@@
-307,12
+307,12
@@
int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
ret = blkdev_reread_part(bdev);
break;
case BLKGETSIZE:
ret = blkdev_reread_part(bdev);
break;
case BLKGETSIZE:
- size =
bdev->bd_inode->i_size
;
+ size =
i_size_read(bdev->bd_inode)
;
if ((size >> 9) > ~0UL)
return -EFBIG;
return put_ulong(arg, size >> 9);
case BLKGETSIZE64:
if ((size >> 9) > ~0UL)
return -EFBIG;
return put_ulong(arg, size >> 9);
case BLKGETSIZE64:
- return put_u64(arg,
bdev->bd_inode->i_size
);
+ return put_u64(arg,
i_size_read(bdev->bd_inode)
);
case BLKTRACESTART:
case BLKTRACESTOP:
case BLKTRACESETUP:
case BLKTRACESTART:
case BLKTRACESTOP:
case BLKTRACESETUP: