aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2011-03-07 04:38:56 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-03 19:16:18 -0400
commit73d901b74f1070c8a664349b564ba6f8bc8ab283 (patch)
tree28464078ca3fe242d7109b3d21696a2927fdb750 /include
parent8432b31457bee1f32cd2ede82e4a68b1af1d5225 (diff)
drbd: remove now unused connector related files
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/drbd_nl.h172
-rw-r--r--include/linux/drbd_tag_magic.h84
2 files changed, 0 insertions, 256 deletions
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
deleted file mode 100644
index 1216c7a432c5..000000000000
--- a/include/linux/drbd_nl.h
+++ /dev/null
@@ -1,172 +0,0 @@
1/*
2 PAKET( name,
3 TYPE ( pn, pr, member )
4 ...
5 )
6
7 You may never reissue one of the pn arguments
8*/
9
10#if !defined(NL_PACKET) || !defined(NL_STRING) || !defined(NL_INTEGER) || !defined(NL_BIT) || !defined(NL_INT64)
11#error "The macros NL_PACKET, NL_STRING, NL_INTEGER, NL_INT64 and NL_BIT needs to be defined"
12#endif
13
14NL_PACKET(primary, 1,
15 NL_BIT( 1, T_MAY_IGNORE, primary_force)
16)
17
18NL_PACKET(secondary, 2, )
19
20NL_PACKET(disk_conf, 3,
21 NL_INT64( 2, T_MAY_IGNORE, disk_size)
22 NL_STRING( 3, T_MANDATORY, backing_dev, 128)
23 NL_STRING( 4, T_MANDATORY, meta_dev, 128)
24 NL_INTEGER( 5, T_MANDATORY, meta_dev_idx)
25 NL_INTEGER( 6, T_MAY_IGNORE, on_io_error)
26 NL_INTEGER( 7, T_MAY_IGNORE, fencing)
27 NL_BIT( 37, T_MAY_IGNORE, use_bmbv)
28 NL_BIT( 53, T_MAY_IGNORE, no_disk_flush)
29 NL_BIT( 54, T_MAY_IGNORE, no_md_flush)
30 /* 55 max_bio_size was available in 8.2.6rc2 */
31 NL_INTEGER( 56, T_MAY_IGNORE, max_bio_bvecs)
32 NL_BIT( 57, T_MAY_IGNORE, no_disk_barrier)
33 NL_BIT( 58, T_MAY_IGNORE, no_disk_drain)
34)
35
36NL_PACKET(detach, 4, )
37
38NL_PACKET(net_conf, 5,
39 NL_STRING( 8, T_MANDATORY, my_addr, 128)
40 NL_STRING( 9, T_MANDATORY, peer_addr, 128)
41 NL_STRING( 10, T_MAY_IGNORE, shared_secret, SHARED_SECRET_MAX)
42 NL_STRING( 11, T_MAY_IGNORE, cram_hmac_alg, SHARED_SECRET_MAX)
43 NL_STRING( 44, T_MAY_IGNORE, integrity_alg, SHARED_SECRET_MAX)
44 NL_INTEGER( 14, T_MAY_IGNORE, timeout)
45 NL_INTEGER( 15, T_MANDATORY, wire_protocol)
46 NL_INTEGER( 16, T_MAY_IGNORE, try_connect_int)
47 NL_INTEGER( 17, T_MAY_IGNORE, ping_int)
48 NL_INTEGER( 18, T_MAY_IGNORE, max_epoch_size)
49 NL_INTEGER( 19, T_MAY_IGNORE, max_buffers)
50 NL_INTEGER( 20, T_MAY_IGNORE, unplug_watermark)
51 NL_INTEGER( 21, T_MAY_IGNORE, sndbuf_size)
52 NL_INTEGER( 22, T_MAY_IGNORE, ko_count)
53 NL_INTEGER( 24, T_MAY_IGNORE, after_sb_0p)
54 NL_INTEGER( 25, T_MAY_IGNORE, after_sb_1p)
55 NL_INTEGER( 26, T_MAY_IGNORE, after_sb_2p)
56 NL_INTEGER( 39, T_MAY_IGNORE, rr_conflict)
57 NL_INTEGER( 40, T_MAY_IGNORE, ping_timeo)
58 NL_INTEGER( 67, T_MAY_IGNORE, rcvbuf_size)
59 NL_INTEGER( 81, T_MAY_IGNORE, on_congestion)
60 NL_INTEGER( 82, T_MAY_IGNORE, cong_fill)
61 NL_INTEGER( 83, T_MAY_IGNORE, cong_extents)
62 /* 59 addr_family was available in GIT, never released */
63 NL_BIT( 60, T_MANDATORY, mind_af)
64 NL_BIT( 27, T_MAY_IGNORE, want_lose)
65 NL_BIT( 28, T_MAY_IGNORE, two_primaries)
66 NL_BIT( 41, T_MAY_IGNORE, always_asbp)
67 NL_BIT( 61, T_MAY_IGNORE, no_cork)
68 NL_BIT( 62, T_MANDATORY, auto_sndbuf_size)
69 NL_BIT( 70, T_MANDATORY, dry_run)
70)
71
72NL_PACKET(disconnect, 6,
73 NL_BIT( 84, T_MAY_IGNORE, force)
74)
75
76NL_PACKET(resize, 7,
77 NL_INT64( 29, T_MAY_IGNORE, resize_size)
78 NL_BIT( 68, T_MAY_IGNORE, resize_force)
79 NL_BIT( 69, T_MANDATORY, no_resync)
80)
81
82NL_PACKET(syncer_conf, 8,
83 NL_INTEGER( 30, T_MAY_IGNORE, rate)
84 NL_INTEGER( 31, T_MAY_IGNORE, after)
85 NL_INTEGER( 32, T_MAY_IGNORE, al_extents)
86/* NL_INTEGER( 71, T_MAY_IGNORE, dp_volume)
87 * NL_INTEGER( 72, T_MAY_IGNORE, dp_interval)
88 * NL_INTEGER( 73, T_MAY_IGNORE, throttle_th)
89 * NL_INTEGER( 74, T_MAY_IGNORE, hold_off_th)
90 * feature will be reimplemented differently with 8.3.9 */
91 NL_STRING( 52, T_MAY_IGNORE, verify_alg, SHARED_SECRET_MAX)
92 NL_STRING( 51, T_MAY_IGNORE, cpu_mask, 32)
93 NL_STRING( 64, T_MAY_IGNORE, csums_alg, SHARED_SECRET_MAX)
94 NL_BIT( 65, T_MAY_IGNORE, use_rle)
95 NL_INTEGER( 75, T_MAY_IGNORE, on_no_data)
96 NL_INTEGER( 76, T_MAY_IGNORE, c_plan_ahead)
97 NL_INTEGER( 77, T_MAY_IGNORE, c_delay_target)
98 NL_INTEGER( 78, T_MAY_IGNORE, c_fill_target)
99 NL_INTEGER( 79, T_MAY_IGNORE, c_max_rate)
100 NL_INTEGER( 80, T_MAY_IGNORE, c_min_rate)
101)
102
103NL_PACKET(invalidate, 9, )
104NL_PACKET(invalidate_peer, 10, )
105NL_PACKET(pause_sync, 11, )
106NL_PACKET(resume_sync, 12, )
107NL_PACKET(suspend_io, 13, )
108NL_PACKET(resume_io, 14, )
109NL_PACKET(outdate, 15, )
110NL_PACKET(get_config, 16, )
111NL_PACKET(get_state, 17,
112 NL_INTEGER( 33, T_MAY_IGNORE, state_i)
113)
114
115NL_PACKET(get_uuids, 18,
116 NL_STRING( 34, T_MAY_IGNORE, uuids, (UI_SIZE*sizeof(__u64)))
117 NL_INTEGER( 35, T_MAY_IGNORE, uuids_flags)
118)
119
120NL_PACKET(get_timeout_flag, 19,
121 NL_BIT( 36, T_MAY_IGNORE, use_degraded)
122)
123
124NL_PACKET(call_helper, 20,
125 NL_STRING( 38, T_MAY_IGNORE, helper, 32)
126)
127
128/* Tag nr 42 already allocated in drbd-8.1 development. */
129
130NL_PACKET(sync_progress, 23,
131 NL_INTEGER( 43, T_MAY_IGNORE, sync_progress)
132)
133
134NL_PACKET(dump_ee, 24,
135 NL_STRING( 45, T_MAY_IGNORE, dump_ee_reason, 32)
136 NL_STRING( 46, T_MAY_IGNORE, seen_digest, SHARED_SECRET_MAX)
137 NL_STRING( 47, T_MAY_IGNORE, calc_digest, SHARED_SECRET_MAX)
138 NL_INT64( 48, T_MAY_IGNORE, ee_sector)
139 NL_INT64( 49, T_MAY_IGNORE, ee_block_id)
140 NL_STRING( 50, T_MAY_IGNORE, ee_data, 32 << 10)
141)
142
143NL_PACKET(start_ov, 25,
144 NL_INT64( 66, T_MAY_IGNORE, start_sector)
145)
146
147NL_PACKET(new_c_uuid, 26,
148 NL_BIT( 63, T_MANDATORY, clear_bm)
149)
150
151#ifdef NL_RESPONSE
152NL_RESPONSE(return_code_only, 27)
153#endif
154
155NL_PACKET(new_connection, 28, /* CHT_CTOR */
156 NL_STRING( 85, T_MANDATORY, name, DRBD_NL_OBJ_NAME_LEN)
157)
158
159NL_PACKET(new_minor, 29, /* CHT_CONN */
160 NL_INTEGER( 86, T_MANDATORY, minor)
161 NL_INTEGER( 87, T_MANDATORY, vol_nr)
162)
163
164NL_PACKET(del_minor, 30, ) /* CHT_MINOR */
165NL_PACKET(del_connection, 31, ) /* CHT_CONN */
166
167#undef NL_PACKET
168#undef NL_INTEGER
169#undef NL_INT64
170#undef NL_BIT
171#undef NL_STRING
172#undef NL_RESPONSE
diff --git a/include/linux/drbd_tag_magic.h b/include/linux/drbd_tag_magic.h
deleted file mode 100644
index 069543190516..000000000000
--- a/include/linux/drbd_tag_magic.h
+++ /dev/null
@@ -1,84 +0,0 @@
1#ifndef DRBD_TAG_MAGIC_H
2#define DRBD_TAG_MAGIC_H
3
4#define TT_END 0
5#define TT_REMOVED 0xE000
6
7/* declare packet_type enums */
8enum packet_types {
9#define NL_PACKET(name, number, fields) P_ ## name = number,
10#define NL_RESPONSE(name, number) P_ ## name = number,
11#define NL_INTEGER(pn, pr, member)
12#define NL_INT64(pn, pr, member)
13#define NL_BIT(pn, pr, member)
14#define NL_STRING(pn, pr, member, len)
15#include "drbd_nl.h"
16 P_nl_after_last_packet,
17};
18
19/* These struct are used to deduce the size of the tag lists: */
20#define NL_PACKET(name, number, fields) \
21 struct name ## _tag_len_struct { fields };
22#define NL_INTEGER(pn, pr, member) \
23 int member; int tag_and_len ## member;
24#define NL_INT64(pn, pr, member) \
25 __u64 member; int tag_and_len ## member;
26#define NL_BIT(pn, pr, member) \
27 unsigned char member:1; int tag_and_len ## member;
28#define NL_STRING(pn, pr, member, len) \
29 unsigned char member[len]; int member ## _len; \
30 int tag_and_len ## member;
31#include "linux/drbd_nl.h"
32
33/* declare tag-list-sizes */
34static const int tag_list_sizes[] = {
35#define NL_PACKET(name, number, fields) 2 fields ,
36#define NL_INTEGER(pn, pr, member) + 4 + 4
37#define NL_INT64(pn, pr, member) + 4 + 8
38#define NL_BIT(pn, pr, member) + 4 + 1
39#define NL_STRING(pn, pr, member, len) + 4 + (len)
40#include "drbd_nl.h"
41};
42
43/* The two highest bits are used for the tag type */
44#define TT_MASK 0xC000
45#define TT_INTEGER 0x0000
46#define TT_INT64 0x4000
47#define TT_BIT 0x8000
48#define TT_STRING 0xC000
49/* The next bit indicates if processing of the tag is mandatory */
50#define T_MANDATORY 0x2000
51#define T_MAY_IGNORE 0x0000
52#define TN_MASK 0x1fff
53/* The remaining 13 bits are used to enumerate the tags */
54
55#define tag_type(T) ((T) & TT_MASK)
56#define tag_number(T) ((T) & TN_MASK)
57
58/* declare tag enums */
59#define NL_PACKET(name, number, fields) fields
60enum drbd_tags {
61#define NL_INTEGER(pn, pr, member) T_ ## member = pn | TT_INTEGER | pr ,
62#define NL_INT64(pn, pr, member) T_ ## member = pn | TT_INT64 | pr ,
63#define NL_BIT(pn, pr, member) T_ ## member = pn | TT_BIT | pr ,
64#define NL_STRING(pn, pr, member, len) T_ ## member = pn | TT_STRING | pr ,
65#include "drbd_nl.h"
66};
67
68struct tag {
69 const char *name;
70 int type_n_flags;
71 int max_len;
72};
73
74/* declare tag names */
75#define NL_PACKET(name, number, fields) fields
76static const struct tag tag_descriptions[] = {
77#define NL_INTEGER(pn, pr, member) [ pn ] = { #member, TT_INTEGER | pr, sizeof(int) },
78#define NL_INT64(pn, pr, member) [ pn ] = { #member, TT_INT64 | pr, sizeof(__u64) },
79#define NL_BIT(pn, pr, member) [ pn ] = { #member, TT_BIT | pr, sizeof(int) },
80#define NL_STRING(pn, pr, member, len) [ pn ] = { #member, TT_STRING | pr, (len) },
81#include "drbd_nl.h"
82};
83
84#endif