Ceph can use user_match() instead of defining its own identical function.
Signed-off-by: David Howells <[email protected]>
cc: Tommi Virtanen <[email protected]>
cc: Sage Weil <[email protected]>
---
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 <linux/key-type.h>
#include <keys/ceph-type.h>
+#include <keys/user-type.h>
#include <linux/ceph/decode.h>
#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,
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
