diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-09-22 22:54:56 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-22 22:54:56 +1000 |
| commit | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch) | |
| tree | aa0e546b39fa4d0a434919ff106721dfc3777a3d /fs | |
| parent | Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next (diff) | |
| parent | KEYS: Check hex2bin()'s return when generating an asymmetric key ID (diff) | |
| download | linux-dev-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.xz linux-dev-35e1efd25a9e7d5cf2884fa23441ab87353849bb.zip | |
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifs_spnego.c | 1 | ||||
| -rw-r--r-- | fs/cifs/cifsacl.c | 1 | ||||
| -rw-r--r-- | fs/nfs/idmap.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index a3e932547617..f4cf200b3c76 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c @@ -62,7 +62,6 @@ cifs_spnego_key_destroy(struct key *key) struct key_type cifs_spnego_key_type = { .name = "cifs.spnego", .instantiate = cifs_spnego_key_instantiate, - .match = user_match, .destroy = cifs_spnego_key_destroy, .describe = user_describe, }; diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 7ff866dbb89e..6d00c419cbae 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -84,7 +84,6 @@ static struct key_type cifs_idmap_key_type = { .instantiate = cifs_idmap_key_instantiate, .destroy = cifs_idmap_key_destroy, .describe = user_describe, - .match = user_match, }; static char * diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 7dd55b745c4d..2f5db844c172 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -177,7 +177,6 @@ static struct key_type key_type_id_resolver = { .preparse = user_preparse, .free_preparse = user_free_preparse, .instantiate = generic_key_instantiate, - .match = user_match, .revoke = user_revoke, .destroy = user_destroy, .describe = user_describe, @@ -401,7 +400,6 @@ static struct key_type key_type_id_resolver_legacy = { .preparse = user_preparse, .free_preparse = user_free_preparse, .instantiate = generic_key_instantiate, - .match = user_match, .revoke = user_revoke, .destroy = user_destroy, .describe = user_describe, |