diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /fs/ocfs2/cluster/tcp.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'fs/ocfs2/cluster/tcp.c')
| -rw-r--r-- | fs/ocfs2/cluster/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 0f60cc0d3985..1591eb37a723 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | ##args); \ | 108 | ##args); \ |
| 109 | } while (0) | 109 | } while (0) |
| 110 | 110 | ||
| 111 | static rwlock_t o2net_handler_lock = RW_LOCK_UNLOCKED; | 111 | static DEFINE_RWLOCK(o2net_handler_lock); |
| 112 | static struct rb_root o2net_handler_tree = RB_ROOT; | 112 | static struct rb_root o2net_handler_tree = RB_ROOT; |
| 113 | 113 | ||
| 114 | static struct o2net_node o2net_nodes[O2NM_MAX_NODES]; | 114 | static struct o2net_node o2net_nodes[O2NM_MAX_NODES]; |