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 git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
fs
/
gfs2
/
rgrp.c
diff --git
a/fs/gfs2/rgrp.c
b/fs/gfs2/rgrp.c
index
6daf4c6
..
171a744
100644
(file)
--- a/
fs/gfs2/rgrp.c
+++ b/
fs/gfs2/rgrp.c
@@
-854,7
+854,8
@@
static void gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset,
if ((start + nr_sects) != blk) {
rv = blkdev_issue_discard(bdev, start,
nr_sects, GFP_NOFS,
if ((start + nr_sects) != blk) {
rv = blkdev_issue_discard(bdev, start,
nr_sects, GFP_NOFS,
- DISCARD_FL_BARRIER);
+ BLKDEV_IFL_WAIT |
+ BLKDEV_IFL_BARRIER);
if (rv)
goto fail;
nr_sects = 0;
if (rv)
goto fail;
nr_sects = 0;
@@
-869,7
+870,7
@@
start_new_extent:
}
if (nr_sects) {
rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS,
}
if (nr_sects) {
rv = blkdev_issue_discard(bdev, start, nr_sects, GFP_NOFS,
-
DISCARD_
FL_BARRIER);
+
BLKDEV_IFL_WAIT | BLKDEV_I
FL_BARRIER);
if (rv)
goto fail;
}
if (rv)
goto fail;
}