RPCSEC_GSS: Misc little cleanups.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---
 include/linux/sunrpc/gss_api.h        |    4 +---
 net/sunrpc/auth_gss/auth_gss.c        |    4 +---
 net/sunrpc/auth_gss/gss_mech_switch.c |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

Index: linux-2.6.11-rc3/net/sunrpc/auth_gss/auth_gss.c
===================================================================
--- linux-2.6.11-rc3.orig/net/sunrpc/auth_gss/auth_gss.c
+++ linux-2.6.11-rc3/net/sunrpc/auth_gss/auth_gss.c
@@ -440,8 +440,6 @@ gss_pipe_downcall(struct file *filp, con
 {
 	const void *p, *end;
 	void *buf;
-	struct inode *inode = filp->f_dentry->d_inode;
-	struct rpc_inode *rpci = RPC_I(inode);
 	struct rpc_clnt *clnt;
 	struct gss_auth *gss_auth;
 	struct auth_cred acred = { 0 };
@@ -458,7 +456,7 @@ gss_pipe_downcall(struct file *filp, con
 	if (!buf)
 		goto out;
 
-	clnt = rpci->private;
+	clnt = RPC_I(filp->f_dentry->d_inode)->private;
 	err = -EFAULT;
 	if (copy_from_user(buf, src, mlen))
 		goto err;
Index: linux-2.6.11-rc3/include/linux/sunrpc/gss_api.h
===================================================================
--- linux-2.6.11-rc3.orig/include/linux/sunrpc/gss_api.h
+++ linux-2.6.11-rc3/include/linux/sunrpc/gss_api.h
@@ -51,8 +51,6 @@ u32 gss_verify_mic(
 u32 gss_delete_sec_context(
 		struct gss_ctx		**ctx_id);
 
-struct gss_api_mech * gss_mech_get_by_name(char *name);
-struct gss_api_mech * gss_mech_get_by_pseudoflavor(u32 pseudoflavor);
 u32 gss_pseudoflavor_to_service(struct gss_api_mech *, u32 pseudoflavor);
 char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service);
 
@@ -107,7 +105,7 @@ void gss_mech_unregister(struct gss_api_
 struct gss_api_mech * gss_mech_get_by_OID(struct xdr_netobj *);
 
 /* Returns a reference to a mechanism, given a name like "krb5" etc. */
-struct gss_api_mech *gss_mech_get_by_name(char *);
+struct gss_api_mech *gss_mech_get_by_name(const char *);
 
 /* Similar, but get by pseudoflavor. */
 struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32);
Index: linux-2.6.11-rc3/net/sunrpc/auth_gss/gss_mech_switch.c
===================================================================
--- linux-2.6.11-rc3.orig/net/sunrpc/auth_gss/gss_mech_switch.c
+++ linux-2.6.11-rc3/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -143,7 +143,7 @@ gss_mech_get(struct gss_api_mech *gm)
 EXPORT_SYMBOL(gss_mech_get);
 
 struct gss_api_mech *
-gss_mech_get_by_name(char *name)
+gss_mech_get_by_name(const char *name)
 {
 	struct gss_api_mech	*pos, *gm = NULL;