Merge tag 'dm-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper...

[firefly-linux-kernel-4.4.55.git] / fs / nfs / idmap.c

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 7dd55b745c4d96cf07de07fc1a925a3590fbd802..2f5db844c172534a229d86b011be1f6ec2c29aff 100644 (file)
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -177,7 +177,6 @@ static struct key_type key_type_id_resolver = {
        .preparse       = user_preparse,
        .free_preparse  = user_free_preparse,
        .instantiate    = generic_key_instantiate,
-       .match          = user_match,
        .revoke         = user_revoke,
        .destroy        = user_destroy,
        .describe       = user_describe,
@@ -401,7 +400,6 @@ static struct key_type key_type_id_resolver_legacy = {
        .preparse       = user_preparse,
        .free_preparse  = user_free_preparse,
        .instantiate    = generic_key_instantiate,
-       .match          = user_match,
        .revoke         = user_revoke,
        .destroy        = user_destroy,
        .describe       = user_describe,