diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /fs/ocfs2/cluster/tcp_internal.h | |
| parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
| parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'fs/ocfs2/cluster/tcp_internal.h')
| -rw-r--r-- | fs/ocfs2/cluster/tcp_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index 8d58cfe410b1..96fa7ebc530c 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h | |||
| @@ -32,10 +32,10 @@ | |||
| 32 | * on their number */ | 32 | * on their number */ |
| 33 | #define O2NET_QUORUM_DELAY_MS ((o2hb_dead_threshold + 2) * O2HB_REGION_TIMEOUT_MS) | 33 | #define O2NET_QUORUM_DELAY_MS ((o2hb_dead_threshold + 2) * O2HB_REGION_TIMEOUT_MS) |
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * This version number represents quite a lot, unfortunately. It not | 36 | * This version number represents quite a lot, unfortunately. It not |
| 37 | * only represents the raw network message protocol on the wire but also | 37 | * only represents the raw network message protocol on the wire but also |
| 38 | * locking semantics of the file system using the protocol. It should | 38 | * locking semantics of the file system using the protocol. It should |
| 39 | * be somewhere else, I'm sure, but right now it isn't. | 39 | * be somewhere else, I'm sure, but right now it isn't. |
| 40 | * | 40 | * |
| 41 | * With version 11, we separate out the filesystem locking portion. The | 41 | * With version 11, we separate out the filesystem locking portion. The |