diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 01:34:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 01:34:49 +0400 |
| commit | 325a9a3d3990e77c62b771a71239fcd0cb6f6e2c (patch) | |
| tree | 5f5a1b61f2730d61b94924cb1f9297d976260a0f /fs/cifs/dns_resolve.c | |
| parent | e4268bd3b2b0380faaa62fad3e8d705eea21d124 (diff) | |
| parent | 87ed1d65fb536a0cd4e84874c0b038f953e448aa (diff) | |
| download | linux-325a9a3d3990e77c62b771a71239fcd0cb6f6e2c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Add destroy routine for dns_resolver
[CIFS] Reorder cifs config item for better clarity
[CIFS] Correct keys dependency for cifs kerberos support
Diffstat (limited to 'fs/cifs/dns_resolve.c')
| -rw-r--r-- | fs/cifs/dns_resolve.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index f730ef35499e..a2e0673e1b08 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c @@ -47,11 +47,18 @@ static int dns_resolver_instantiate(struct key *key, const void *data, return rc; } +static void +dns_resolver_destroy(struct key *key) +{ + kfree(key->payload.data); +} + struct key_type key_type_dns_resolver = { .name = "dns_resolver", .def_datalen = sizeof(struct in_addr), .describe = user_describe, .instantiate = dns_resolver_instantiate, + .destroy = dns_resolver_destroy, .match = user_match, }; |