diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-07-23 11:48:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-07-23 11:48:17 +0200 |
commit | b59f2b4d30c187160df597bae41cabe497b6acf4 (patch) | |
tree | e29ed9e3cbaf777cc1a10c99c4542985002d2c88 /include/linux/sunrpc/gss_api.h | |
parent | 1e40c2edef2537f87f94d0baf80aeaeb7d51cc23 (diff) | |
parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) |
Merge tag 'v3.11-rc2' into core/locking
Merge in Linux 3.11-rc2 before moving on with new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sunrpc/gss_api.h')
-rw-r--r-- | include/linux/sunrpc/gss_api.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h index 161463e59624..1f911ccb2a75 100644 --- a/include/linux/sunrpc/gss_api.h +++ b/include/linux/sunrpc/gss_api.h @@ -151,6 +151,8 @@ struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32); /* Fill in an array with a list of supported pseudoflavors */ int gss_mech_list_pseudoflavors(rpc_authflavor_t *, int); +struct gss_api_mech * gss_mech_get(struct gss_api_mech *); + /* For every successful gss_mech_get or gss_mech_get_by_* call there must be a * corresponding call to gss_mech_put. */ void gss_mech_put(struct gss_api_mech *); |