iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Combine nfs_idmap_{init|quit}() and nfs_idmap_{init|quit}_keyring()

Browse Source 
The idmap_init() and idmap_quit() functions only exist to call the
_keyring() version.  Let's just call the keyring() functions directly.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2015-07-13 14:01:29 -04:00 committed by Trond Myklebust
parent d8efa4e625
commit fb2a525cf0
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/nfs4idmap.c
View File

@ -184,7 +184,7 @@ static struct key_type key_type_id_resolver = {
.read = user_read, .read = user_read,
}; };
static int nfs_idmap_init_keyring(void) int nfs_idmap_init(void)
{ {
struct cred *cred; struct cred *cred;
struct key *keyring; struct key *keyring;
@ -230,7 +230,7 @@ failed_put_cred:
return ret; return ret;
} }
static void nfs_idmap_quit_keyring(void) void nfs_idmap_quit(void)
{ {
key_revoke(id_resolver_cache->thread_keyring); key_revoke(id_resolver_cache->thread_keyring);
unregister_key_type(&key_type_id_resolver); unregister_key_type(&key_type_id_resolver);
@ -492,16 +492,6 @@ nfs_idmap_delete(struct nfs_client *clp)
kfree(idmap); kfree(idmap);
} }
int nfs_idmap_init(void)
{
return nfs_idmap_init_keyring();
}
void nfs_idmap_quit(void)
{
nfs_idmap_quit_keyring();
}
static int nfs_idmap_prepare_message(char *desc, struct idmap *idmap, static int nfs_idmap_prepare_message(char *desc, struct idmap *idmap,
struct idmap_msg *im, struct idmap_msg *im,
struct rpc_pipe_msg *msg) struct rpc_pipe_msg *msg)