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.infradead.org/~dwmw2/mtd-2.6.35
[pandora-kernel.git]
/
drivers
/
block
/
drbd
/
drbd_req.h
diff --git
a/drivers/block/drbd/drbd_req.h
b/drivers/block/drbd/drbd_req.h
index
16119d7
..
02d575d
100644
(file)
--- a/
drivers/block/drbd/drbd_req.h
+++ b/
drivers/block/drbd/drbd_req.h
@@
-91,6
+91,7
@@
enum drbd_req_event {
send_failed,
handed_over_to_network,
connection_lost_while_pending,
+ read_retry_remote_canceled,
recv_acked_by_peer,
write_acked_by_peer,
write_acked_by_peer_and_sis, /* and set_in_sync */