diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2017-03-06 12:58:42 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-26 12:13:19 +0200 |
| commit | e08f608ab4288f4192a504e6c94dd7c9c931dad8 (patch) | |
| tree | 4e68fc63e79d127de909d349492c024251a8d7b0 /fs/gfs2 | |
| parent | 4f47ca4882564c4b76cc9c426583a49d23893dda (diff) | |
| download | linux-stable-e08f608ab4288f4192a504e6c94dd7c9c931dad8.tar.gz linux-stable-e08f608ab4288f4192a504e6c94dd7c9c931dad8.tar.bz2 linux-stable-e08f608ab4288f4192a504e6c94dd7c9c931dad8.zip | |
gfs2: Avoid alignment hole in struct lm_lockname
commit 28ea06c46fbcab63fd9a55531387b7928a18a590 upstream.
Commit 88ffbf3e03 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: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/incore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index de7b4f97ac75..be519416c112 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -207,7 +207,7 @@ struct lm_lockname { struct gfs2_sbd *ln_sbd; u64 ln_number; unsigned int ln_type; -}; +} __packed __aligned(sizeof(int)); #define lm_name_equal(name1, name2) \ (((name1)->ln_number == (name2)->ln_number) && \ |