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: remove BLKDEV_IFL_WAIT
[pandora-kernel.git]
/
block
/
ioctl.c
diff --git
a/block/ioctl.c
b/block/ioctl.c
index
d8052f0
..
cb2b909
100644
(file)
--- a/
block/ioctl.c
+++ b/
block/ioctl.c
@@
-116,7
+116,7
@@
static int blkdev_reread_part(struct block_device *bdev)
static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
uint64_t len, int secure)
{
static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
uint64_t len, int secure)
{
- unsigned long flags =
BLKDEV_IFL_WAIT
;
+ unsigned long flags =
0
;
if (start & 511)
return -EINVAL;
if (start & 511)
return -EINVAL;
@@
-128,7
+128,7
@@
static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
if (start + len > (bdev->bd_inode->i_size >> 9))
return -EINVAL;
if (secure)
if (start + len > (bdev->bd_inode->i_size >> 9))
return -EINVAL;
if (secure)
- flags |= BLKDEV_
IFL
_SECURE;
+ flags |= BLKDEV_
DISCARD
_SECURE;
return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags);
}
return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags);
}