Commit e08f608a authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Greg Kroah-Hartman

gfs2: Avoid alignment hole in struct lm_lockname

commit 28ea06c4 upstream.

Commit 88ffbf3e switches to using rhashtables for glocks, hashing over
the entire struct lm_lockname instead of its individual fields.  On some
architectures, struct lm_lockname contains a hole of uninitialized
memory due to alignment rules, which now leads to incorrect hash values.
Get rid of that hole.
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f47ca48
...@@ -207,7 +207,7 @@ struct lm_lockname { ...@@ -207,7 +207,7 @@ struct lm_lockname {
struct gfs2_sbd *ln_sbd; struct gfs2_sbd *ln_sbd;
u64 ln_number; u64 ln_number;
unsigned int ln_type; unsigned int ln_type;
}; } __packed __aligned(sizeof(int));
#define lm_name_equal(name1, name2) \ #define lm_name_equal(name1, name2) \
(((name1)->ln_number == (name2)->ln_number) && \ (((name1)->ln_number == (name2)->ln_number) && \
......
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