projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
[cascardo/linux.git]
/
fs
/
ocfs2
/
cluster
/
tcp_internal.h
diff --git
a/fs/ocfs2/cluster/tcp_internal.h
b/fs/ocfs2/cluster/tcp_internal.h
index
94b1836
..
b95e7df
100644
(file)
--- a/
fs/ocfs2/cluster/tcp_internal.h
+++ b/
fs/ocfs2/cluster/tcp_internal.h
@@
-44,9
+44,6
@@
* version here in tcp_internal.h should not need to be bumped for
* filesystem locking changes.
*
* version here in tcp_internal.h should not need to be bumped for
* filesystem locking changes.
*
- * New in version 12
- * - Negotiate hb timeout when storage is down.
- *
* New in version 11
* - Negotiation of filesystem locking in the dlm join.
*
* New in version 11
* - Negotiation of filesystem locking in the dlm join.
*
@@
-78,7
+75,7
@@
* - full 64 bit i_size in the metadata lock lvbs
* - introduction of "rw" lock and pushing meta/data locking down
*/
* - full 64 bit i_size in the metadata lock lvbs
* - introduction of "rw" lock and pushing meta/data locking down
*/
-#define O2NET_PROTOCOL_VERSION 1
2
ULL
+#define O2NET_PROTOCOL_VERSION 1
1
ULL
struct o2net_handshake {
__be64 protocol_version;
__be64 connector_id;
struct o2net_handshake {
__be64 protocol_version;
__be64 connector_id;