Commit a0f2b652 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ilya Dryomov

ceph: fix symbol versioning for ceph_monc_do_statfs

The genksyms helper in the kernel cannot parse a type definition
like "typeof(((type *)0)->keyfld)" that is used in the DEFINE_RB_FUNCS
helper, causing the following EXPORT_SYMBOL() statement to be ignored
when computing the crcs, and triggering a warning about this:

WARNING: "ceph_monc_do_statfs" [fs/ceph/ceph.ko] has no CRC

To work around the problem, we can rewrite the type to reference
an undefined 'extern' symbol instead of a NULL pointer. This is
evidently ok for genksyms, and it no longer complains about the
line when calling it with 'genksyms -w'.

I've looked briefly into extending genksyms instead, but it seems
really hard to do. Jan Beulich introduced basic support for 'typeof'
a while ago in dc533240 ("genksyms: fix typeof() handling"),
but that is not sufficient for the expression we have here.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: fcd00b68 ("libceph: DEFINE_RB_FUNCS macro")
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 955818cd
...@@ -215,8 +215,9 @@ static void erase_##name(struct rb_root *root, type *t) \ ...@@ -215,8 +215,9 @@ static void erase_##name(struct rb_root *root, type *t) \
} }
#define DEFINE_RB_LOOKUP_FUNC(name, type, keyfld, nodefld) \ #define DEFINE_RB_LOOKUP_FUNC(name, type, keyfld, nodefld) \
extern type __lookup_##name##_key; \
static type *lookup_##name(struct rb_root *root, \ static type *lookup_##name(struct rb_root *root, \
typeof(((type *)0)->keyfld) key) \ typeof(__lookup_##name##_key.keyfld) key) \
{ \ { \
struct rb_node *n = root->rb_node; \ struct rb_node *n = root->rb_node; \
\ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment