From 7c3bec0a1f2cba8a01b505f032a75cfb8d5cd56d Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 18 Jul 2014 18:56:35 +0100 Subject: [PATCH] KEYS: Ceph: Use user_match() Ceph can use user_match() instead of defining its own identical function. Signed-off-by: David Howells Acked-by: Steve Dickson Reviewed-by: Sage Weil cc: Tommi Virtanen --- net/ceph/crypto.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c index 2c8078d990ee..ffeba8f9dda9 100644 --- a/net/ceph/crypto.c +++ b/net/ceph/crypto.c @@ -8,6 +8,7 @@ #include #include +#include #include #include "crypto.h" @@ -462,11 +463,6 @@ static void ceph_key_free_preparse(struct key_preparsed_payload *prep) kfree(ckey); } -static int ceph_key_match(const struct key *key, const void *description) -{ - return strcmp(key->description, description) == 0; -} - static void ceph_key_destroy(struct key *key) { struct ceph_crypto_key *ckey = key->payload.data; @@ -480,7 +476,7 @@ struct key_type key_type_ceph = { .preparse = ceph_key_preparse, .free_preparse = ceph_key_free_preparse, .instantiate = generic_key_instantiate, - .match = ceph_key_match, + .match = user_match, .destroy = ceph_key_destroy, }; -- 2.20.1