diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-11-12 10:47:37 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-13 13:33:44 -0500 |
| commit | 2e95a371fa4242b4d1413cd6b6a902868455d74b (patch) | |
| tree | 3c517b41e00c560ef52f8f86884c3e2ed2fb51df /e2fsck/revoke.c | |
| parent | 46e1286ae644df4a1340407ad945b8cc7351231b (diff) | |
| download | e2fsprogs-2e95a371fa4242b4d1413cd6b6a902868455d74b.tar.gz | |
Revert "e2fsck: Change kmem_cache_t to lkmem_cache_t for Solaris"
This is a logical revert of commit 1911bf113ef0, for which the
description reads:
Solaris polutes the C namespace with kmem_cache_t when
you include in/netinet.h is included, so rename kmem_cache_t
to lkmem_cache_t.
Reverting this change allows us to keep e2fsck/revoke.c in sync with
its upstream kernel source of fs/jbd2/revoke.c, and was the last
change required to make the e2fsprogs and kernel versions of revoke.c
to be bit identical.
I've confirmed that this is no longer a problem with OmniOS (an
Illumos / Open Solaris derivative). It may be a problem with Solaris,
but since I don't have easy access to Solaris, ¯\_(ツ)_/¯
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'e2fsck/revoke.c')
| -rw-r--r-- | e2fsck/revoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/e2fsck/revoke.c b/e2fsck/revoke.c index b8da99b9..fa608788 100644 --- a/e2fsck/revoke.c +++ b/e2fsck/revoke.c @@ -92,8 +92,8 @@ #include <linux/hash.h> #endif -static lkmem_cache_t *jbd2_revoke_record_cache; -static lkmem_cache_t *jbd2_revoke_table_cache; +static struct kmem_cache *jbd2_revoke_record_cache; +static struct kmem_cache *jbd2_revoke_table_cache; /* Each revoke record represents one single revoked block. During journal replay, this involves recording the transaction ID of the |