tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
bcachefs: Move __bch2_members_v2_get_mut to sb-members.h
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
+14
-14
+6
-11
fs/bcachefs/sb-members.c
+6
-11
fs/bcachefs/sb-members.c
···
21
21
22
22
/* Code for bch_sb_field_members_v1: */
23
23
24
-
static struct bch_member *members_v2_get_mut(struct bch_sb_field_members_v2 *mi, int i)
25
-
{
26
-
return (void *) mi->_members + (i * le16_to_cpu(mi->member_bytes));
27
-
}
28
-
29
24
struct bch_member *bch2_members_v2_get_mut(struct bch_sb *sb, int i)
30
25
{
31
-
return members_v2_get_mut(bch2_sb_field_get(sb, members_v2), i);
26
+
return __bch2_members_v2_get_mut(bch2_sb_field_get(sb, members_v2), i);
32
27
}
33
28
34
29
static struct bch_member members_v2_get(struct bch_sb_field_members_v2 *mi, int i)
35
30
{
36
-
struct bch_member ret, *p = members_v2_get_mut(mi, i);
31
+
struct bch_member ret, *p = __bch2_members_v2_get_mut(mi, i);
37
32
memset(&ret, 0, sizeof(ret));
38
33
memcpy(&ret, p, min_t(size_t, le16_to_cpu(mi->member_bytes), sizeof(ret)));
39
34
return ret;
···
70
75
71
76
for (int i = c->disk_sb.sb->nr_devices - 1; i >= 0; --i) {
72
77
void *dst = (void *) mi->_members + (i * sizeof(struct bch_member));
73
-
memmove(dst, members_v2_get_mut(mi, i), le16_to_cpu(mi->member_bytes));
78
+
memmove(dst, __bch2_members_v2_get_mut(mi, i), le16_to_cpu(mi->member_bytes));
74
79
memset(dst + le16_to_cpu(mi->member_bytes),
75
80
0, (sizeof(struct bch_member) - le16_to_cpu(mi->member_bytes)));
76
81
}
···
113
118
mi2 = bch2_sb_field_get(disk_sb->sb, members_v2);
114
119
115
120
for (unsigned i = 0; i < disk_sb->sb->nr_devices; i++)
116
-
memcpy(members_v1_get_mut(mi1, i), members_v2_get_mut(mi2, i), BCH_MEMBER_V1_BYTES);
121
+
memcpy(members_v1_get_mut(mi1, i), __bch2_members_v2_get_mut(mi2, i), BCH_MEMBER_V1_BYTES);
117
122
118
123
return 0;
119
124
}
···
327
332
struct printbuf *err)
328
333
{
329
334
struct bch_sb_field_members_v2 *mi = field_to_type(f, members_v2);
330
-
size_t mi_bytes = (void *) members_v2_get_mut(mi, sb->nr_devices) -
335
+
size_t mi_bytes = (void *) __bch2_members_v2_get_mut(mi, sb->nr_devices) -
331
336
(void *) mi;
332
337
333
338
if (mi_bytes > vstruct_bytes(&mi->field)) {
···
358
363
359
364
rcu_read_lock();
360
365
for_each_member_device_rcu(ca, c, i, NULL) {
361
-
struct bch_member *m = members_v2_get_mut(mi, i);
366
+
struct bch_member *m = __bch2_members_v2_get_mut(mi, i);
362
367
363
368
for (e = 0; e < BCH_MEMBER_ERROR_NR; e++)
364
369
m->errors[e] = cpu_to_le64(atomic64_read(&ca->errors[e]));
+8
-3
fs/bcachefs/sb-members.h
+8
-3
fs/bcachefs/sb-members.h
···
4
4
5
5
extern char * const bch2_member_error_strs[];
6
6
7
+
static inline struct bch_member *
8
+
__bch2_members_v2_get_mut(struct bch_sb_field_members_v2 *mi, unsigned i)
9
+
{
10
+
return (void *) mi->_members + (i * le16_to_cpu(mi->member_bytes));
11
+
}
12
+
7
13
int bch2_sb_members_v2_init(struct bch_fs *c);
8
14
int bch2_sb_members_cpy_v2_v1(struct bch_sb_handle *disk_sb);
9
15
struct bch_member *bch2_members_v2_get_mut(struct bch_sb *sb, int i);
···
192
186
return !bch2_is_zero(&m->uuid, sizeof(m->uuid));
193
187
}
194
188
195
-
static inline bool bch2_dev_exists(struct bch_sb *sb,
196
-
unsigned dev)
189
+
static inline bool bch2_dev_exists(struct bch_sb *sb, unsigned dev)
197
190
{
198
191
if (dev < sb->nr_devices) {
199
-
struct bch_member m = bch2_sb_member_get(sb, dev);
192
+
struct bch_member m = bch2_sb_member_get(sb, dev);
200
193
return bch2_member_exists(&m);
201
194
}
202
195
return false;