diff options
author | David Howells <dhowells@redhat.com> | 2014-09-16 12:36:06 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2014-09-16 12:36:06 -0400 |
commit | c06cfb08b88dfbe13be44a69ae2fdc3a7c902d81 (patch) | |
tree | 8bc0e3794ffb426b3cbb2c0d7c2dbbd4b28e3054 /net/rxrpc | |
parent | 614d8c39014c185aa0f7254f0a470cc33fc1b284 (diff) |
KEYS: Remove key_type::match in favour of overriding default by match_preparse
A previous patch added a ->match_preparse() method to the key type. This is
allowed to override the function called by the iteration algorithm.
Therefore, we can just set a default that simply checks for an exact match of
the key description with the original criterion data and allow match_preparse
to override it as needed.
The key_type::match op is then redundant and can be removed, as can the
user_match() function.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Diffstat (limited to 'net/rxrpc')
-rw-r--r-- | net/rxrpc/ar-key.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c index 3907add75932..10c6cb694b43 100644 --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c | |||
@@ -44,7 +44,6 @@ struct key_type key_type_rxrpc = { | |||
44 | .preparse = rxrpc_preparse, | 44 | .preparse = rxrpc_preparse, |
45 | .free_preparse = rxrpc_free_preparse, | 45 | .free_preparse = rxrpc_free_preparse, |
46 | .instantiate = generic_key_instantiate, | 46 | .instantiate = generic_key_instantiate, |
47 | .match = user_match, | ||
48 | .destroy = rxrpc_destroy, | 47 | .destroy = rxrpc_destroy, |
49 | .describe = rxrpc_describe, | 48 | .describe = rxrpc_describe, |
50 | .read = rxrpc_read, | 49 | .read = rxrpc_read, |
@@ -61,7 +60,6 @@ struct key_type key_type_rxrpc_s = { | |||
61 | .preparse = rxrpc_preparse_s, | 60 | .preparse = rxrpc_preparse_s, |
62 | .free_preparse = rxrpc_free_preparse_s, | 61 | .free_preparse = rxrpc_free_preparse_s, |
63 | .instantiate = generic_key_instantiate, | 62 | .instantiate = generic_key_instantiate, |
64 | .match = user_match, | ||
65 | .destroy = rxrpc_destroy_s, | 63 | .destroy = rxrpc_destroy_s, |
66 | .describe = rxrpc_describe, | 64 | .describe = rxrpc_describe, |
67 | }; | 65 | }; |