aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
author\\\"J. Bruce Fields\\\ <bfields@citi.umich.edu>2008-06-09 16:51:33 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-09 12:09:11 -0400
commit720b8f2d6f7de9e16f1217448cc7396e1604e175 (patch)
tree440a87cbc2ad2ac5a57501ac1018fbb4c8bff2fb /net/sunrpc
parentb6b6152c46861dd914d0e6cea9c27df057d6e235 (diff)
rpc: eliminate unused variable in auth_gss upcall code
Also, a minor comment grammar fix in the same file. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/auth_gss/auth_gss.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index bf7585b80543..ebfd630541fa 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -272,7 +272,7 @@ __gss_find_upcall(struct rpc_inode *rpci, uid_t uid)
272 return NULL; 272 return NULL;
273} 273}
274 274
275/* Try to add a upcall to the pipefs queue. 275/* Try to add an upcall to the pipefs queue.
276 * If an upcall owned by our uid already exists, then we return a reference 276 * If an upcall owned by our uid already exists, then we return a reference
277 * to that upcall instead of adding the new upcall. 277 * to that upcall instead of adding the new upcall.
278 */ 278 */
@@ -493,7 +493,6 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
493{ 493{
494 const void *p, *end; 494 const void *p, *end;
495 void *buf; 495 void *buf;
496 struct rpc_clnt *clnt;
497 struct gss_upcall_msg *gss_msg; 496 struct gss_upcall_msg *gss_msg;
498 struct inode *inode = filp->f_path.dentry->d_inode; 497 struct inode *inode = filp->f_path.dentry->d_inode;
499 struct gss_cl_ctx *ctx; 498 struct gss_cl_ctx *ctx;
@@ -507,7 +506,6 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
507 if (!buf) 506 if (!buf)
508 goto out; 507 goto out;
509 508
510 clnt = RPC_I(inode)->private;
511 err = -EFAULT; 509 err = -EFAULT;
512 if (copy_from_user(buf, src, mlen)) 510 if (copy_from_user(buf, src, mlen))
513 goto err; 511 goto err;