Commit 8fdee4cc authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Anna Schumaker

sunrpc: whitespace fixes

Remove trailing whitespace and blank line at EOF
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 0f90be13
...@@ -1572,7 +1572,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred) ...@@ -1572,7 +1572,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred)
if (test_bit(RPCAUTH_CRED_NEGATIVE, &cred->cr_flags)) { if (test_bit(RPCAUTH_CRED_NEGATIVE, &cred->cr_flags)) {
unsigned long now = jiffies; unsigned long now = jiffies;
unsigned long begin, expire; unsigned long begin, expire;
struct gss_cred *gss_cred; struct gss_cred *gss_cred;
gss_cred = container_of(cred, struct gss_cred, gc_base); gss_cred = container_of(cred, struct gss_cred, gc_base);
begin = gss_cred->gc_upcall_timestamp; begin = gss_cred->gc_upcall_timestamp;
......
...@@ -231,4 +231,3 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size, ...@@ -231,4 +231,3 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,
} }
EXPORT_SYMBOL_GPL(g_verify_token_header); EXPORT_SYMBOL_GPL(g_verify_token_header);
...@@ -1077,4 +1077,3 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher, ...@@ -1077,4 +1077,3 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,
dprintk("%s: returning %d\n", __func__, err); dprintk("%s: returning %d\n", __func__, err);
return err; return err;
} }
...@@ -324,4 +324,3 @@ u32 gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e, ...@@ -324,4 +324,3 @@ u32 gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e,
err_out: err_out:
return ret; return ret;
} }
...@@ -229,4 +229,3 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text, ...@@ -229,4 +229,3 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
return gss_get_mic_v2(ctx, text, token); return gss_get_mic_v2(ctx, text, token);
} }
} }
...@@ -225,4 +225,3 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx, ...@@ -225,4 +225,3 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
return gss_verify_mic_v2(ctx, message_buffer, read_token); return gss_verify_mic_v2(ctx, message_buffer, read_token);
} }
} }
...@@ -623,4 +623,3 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf) ...@@ -623,4 +623,3 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)
return gss_unwrap_kerberos_v2(kctx, offset, buf); return gss_unwrap_kerberos_v2(kctx, offset, buf);
} }
} }
...@@ -1389,7 +1389,7 @@ static void destroy_use_gss_proxy_proc_entry(struct net *net) ...@@ -1389,7 +1389,7 @@ static void destroy_use_gss_proxy_proc_entry(struct net *net)
struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
if (sn->use_gssp_proc) { if (sn->use_gssp_proc) {
remove_proc_entry("use-gss-proxy", sn->proc_net_rpc); remove_proc_entry("use-gss-proxy", sn->proc_net_rpc);
clear_gssp_clnt(sn); clear_gssp_clnt(sn);
} }
} }
......
...@@ -362,4 +362,3 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied) ...@@ -362,4 +362,3 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)
wake_up(&bc_serv->sv_cb_waitq); wake_up(&bc_serv->sv_cb_waitq);
spin_unlock(&bc_serv->sv_cb_lock); spin_unlock(&bc_serv->sv_cb_lock);
} }
...@@ -892,7 +892,7 @@ rpc_free_client(struct rpc_clnt *clnt) ...@@ -892,7 +892,7 @@ rpc_free_client(struct rpc_clnt *clnt)
/* /*
* Free an RPC client * Free an RPC client
*/ */
static struct rpc_clnt * static struct rpc_clnt *
rpc_free_auth(struct rpc_clnt *clnt) rpc_free_auth(struct rpc_clnt *clnt)
{ {
if (clnt->cl_auth == NULL) if (clnt->cl_auth == NULL)
......
...@@ -213,7 +213,7 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt, ...@@ -213,7 +213,7 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt,
sn->rpcb_local_clnt = clnt; sn->rpcb_local_clnt = clnt;
sn->rpcb_local_clnt4 = clnt4; sn->rpcb_local_clnt4 = clnt4;
sn->rpcb_is_af_local = is_af_local ? 1 : 0; sn->rpcb_is_af_local = is_af_local ? 1 : 0;
smp_wmb(); smp_wmb();
sn->rpcb_users = 1; sn->rpcb_users = 1;
dprintk("RPC: created new rpcb local clients (rpcb_local_clnt: " dprintk("RPC: created new rpcb local clients (rpcb_local_clnt: "
"%p, rpcb_local_clnt4: %p) for net %x%s\n", "%p, rpcb_local_clnt4: %p) for net %x%s\n",
......
...@@ -334,4 +334,3 @@ void rpc_proc_exit(struct net *net) ...@@ -334,4 +334,3 @@ void rpc_proc_exit(struct net *net)
dprintk("RPC: unregistering /proc/net/rpc\n"); dprintk("RPC: unregistering /proc/net/rpc\n");
remove_proc_entry("rpc", net->proc_net); remove_proc_entry("rpc", net->proc_net);
} }
...@@ -57,4 +57,3 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr, ...@@ -57,4 +57,3 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
int rpc_clients_notifier_register(void); int rpc_clients_notifier_register(void);
void rpc_clients_notifier_unregister(void); void rpc_clients_notifier_unregister(void);
#endif /* _NET_SUNRPC_SUNRPC_H */ #endif /* _NET_SUNRPC_SUNRPC_H */
...@@ -880,7 +880,7 @@ static void xprt_wait_on_pinned_rqst(struct rpc_rqst *req) ...@@ -880,7 +880,7 @@ static void xprt_wait_on_pinned_rqst(struct rpc_rqst *req)
__must_hold(&req->rq_xprt->recv_lock) __must_hold(&req->rq_xprt->recv_lock)
{ {
struct rpc_task *task = req->rq_task; struct rpc_task *task = req->rq_task;
if (task && test_bit(RPC_TASK_MSG_RECV, &task->tk_runstate)) { if (task && test_bit(RPC_TASK_MSG_RECV, &task->tk_runstate)) {
spin_unlock(&req->rq_xprt->recv_lock); spin_unlock(&req->rq_xprt->recv_lock);
set_bit(RPC_TASK_MSG_RECV_WAIT, &task->tk_runstate); set_bit(RPC_TASK_MSG_RECV_WAIT, &task->tk_runstate);
......
...@@ -3375,4 +3375,3 @@ module_param_named(tcp_max_slot_table_entries, xprt_max_tcp_slot_table_entries, ...@@ -3375,4 +3375,3 @@ module_param_named(tcp_max_slot_table_entries, xprt_max_tcp_slot_table_entries,
max_slot_table_size, 0644); max_slot_table_size, 0644);
module_param_named(udp_slot_table_entries, xprt_udp_slot_table_entries, module_param_named(udp_slot_table_entries, xprt_udp_slot_table_entries,
slot_table_size, 0644); slot_table_size, 0644);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment