projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f38839
650789c
)
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/drivers
author
Jens Axboe
<jaxboe@fusionio.com>
Sat, 23 Oct 2010 16:43:55 +0000
(18:43 +0200)
committer
Jens Axboe
<jaxboe@fusionio.com>
Sat, 23 Oct 2010 16:43:55 +0000
(18:43 +0200)
1
2
drivers/block/drbd/drbd_int.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/block/drbd/drbd_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/block/drbd/drbd_receiver.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/block/drbd/drbd_int.h
index
9bdcf43
,
0c527d2
..
c68dc29
---
1
/
drivers/block/drbd/drbd_int.h
---
2
/
drivers/block/drbd/drbd_int.h
+++ b/
drivers/block/drbd/drbd_int.h
@@@
-2406,12
-2402,13
+2402,12
@@@
static inline void drbd_md_flush(struc
{
int r;
- if (test_bit(MD_NO_
BARRIER
, &mdev->flags))
+ if (test_bit(MD_NO_
FUA
, &mdev->flags))
return;
- r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL,
- BLKDEV_IFL_WAIT);
+ r = blkdev_issue_flush(mdev->ldev->md_bdev, GFP_KERNEL, NULL);
if (r) {
- set_bit(MD_NO_
BARRIER
, &mdev->flags);
+ set_bit(MD_NO_
FUA
, &mdev->flags);
dev_err(DEV, "meta data flush failed with status %d, disabling md-flushes\n", r);
}
}
diff --cc
drivers/block/drbd/drbd_main.c
Simple merge
diff --cc
drivers/block/drbd/drbd_receiver.c
Simple merge