Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c3bec0a authored by David Howells's avatar David Howells
Browse files

KEYS: Ceph: Use user_match() 



Ceph can use user_match() instead of defining its own identical function.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarSteve Dickson <steved@redhat.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
cc: Tommi Virtanen <tommi.virtanen@dreamhost.com>
parent efa64c09

net/ceph/crypto.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/key-type.h>

#include <linux/key-type.h>





#include <keys/ceph-type.h>

#include <keys/ceph-type.h>

#include <keys/user-type.h>

#include <linux/ceph/decode.h>

#include <linux/ceph/decode.h>

#include "crypto.h"

#include "crypto.h"
@@ -462,11 +463,6 @@ static void ceph_key_free_preparse(struct key_preparsed_payload *prep) 
	kfree(ckey);

	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)

static void ceph_key_destroy(struct key *key)

{

{

	struct ceph_crypto_key *ckey = key->payload.data;

	struct ceph_crypto_key *ckey = key->payload.data;
@@ -480,7 +476,7 @@ struct key_type key_type_ceph = { 
	.preparse	= ceph_key_preparse,

	.preparse	= ceph_key_preparse,

	.free_preparse	= ceph_key_free_preparse,

	.free_preparse	= ceph_key_free_preparse,

	.instantiate	= generic_key_instantiate,

	.instantiate	= generic_key_instantiate,

	.match		= ceph_key_match,

	.match		= user_match,

	.destroy	= ceph_key_destroy,

	.destroy	= ceph_key_destroy,

};

};