diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 16:24:06 -0400 |
| commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
| tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /fs/ocfs2/cluster/nodemanager.h | |
| parent | b001a1b6aa960949a24c2cdc28257dfcc9428d74 (diff) | |
| parent | 8948896c9e098c6fd31a6a698a598a7cbd7fa40e (diff) | |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
Diffstat (limited to 'fs/ocfs2/cluster/nodemanager.h')
| -rw-r--r-- | fs/ocfs2/cluster/nodemanager.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/cluster/nodemanager.h b/fs/ocfs2/cluster/nodemanager.h index 7c860361b8dd..c992ea0da4ad 100644 --- a/fs/ocfs2/cluster/nodemanager.h +++ b/fs/ocfs2/cluster/nodemanager.h | |||
| @@ -33,10 +33,6 @@ | |||
| 33 | #include <linux/configfs.h> | 33 | #include <linux/configfs.h> |
| 34 | #include <linux/rbtree.h> | 34 | #include <linux/rbtree.h> |
| 35 | 35 | ||
| 36 | #define FS_OCFS2_NM 1 | ||
| 37 | |||
| 38 | const char *o2nm_get_hb_ctl_path(void); | ||
| 39 | |||
| 40 | struct o2nm_node { | 36 | struct o2nm_node { |
| 41 | spinlock_t nd_lock; | 37 | spinlock_t nd_lock; |
| 42 | struct config_item nd_item; | 38 | struct config_item nd_item; |