projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
[firefly-linux-kernel-4.4.55.git]
/
block
/
ioctl.c
diff --git
a/block/ioctl.c
b/block/ioctl.c
index d724ceb1d46535fee2fa3e65ca57cb09cb88997d..a9a302eba01e6a78b46e3af154c4f1b2a1c2c510 100644
(file)
--- a/
block/ioctl.c
+++ b/
block/ioctl.c
@@
-5,7
+5,6
@@
#include <linux/hdreg.h>
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
#include <linux/hdreg.h>
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
-#include <linux/smp_lock.h>
#include <linux/blktrace_api.h>
#include <asm/uaccess.h>
#include <linux/blktrace_api.h>
#include <asm/uaccess.h>
@@
-125,7
+124,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;
@@
-242,6
+241,7
@@
int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
* We need to set the startsect first, the driver may
* want to override it.
*/
* We need to set the startsect first, the driver may
* want to override it.
*/
+ memset(&geo, 0, sizeof(geo));
geo.start = get_start_sect(bdev);
ret = disk->fops->getgeo(bdev, &geo);
if (ret)
geo.start = get_start_sect(bdev);
ret = disk->fops->getgeo(bdev, &geo);
if (ret)
@@
-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: