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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
fs
/
btrfs
/
extent-tree.c
diff --git
a/fs/btrfs/extent-tree.c
b/fs/btrfs/extent-tree.c
index
a46b64d
..
32d0940
100644
(file)
--- a/
fs/btrfs/extent-tree.c
+++ b/
fs/btrfs/extent-tree.c
@@
-1696,7
+1696,7
@@
static void btrfs_issue_discard(struct block_device *bdev,
u64 start, u64 len)
{
blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,
-
DISCARD_
FL_BARRIER);
+
BLKDEV_IFL_WAIT | BLKDEV_I
FL_BARRIER);
}
static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,