lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/atm/svc.c: checkpatch cleanups

Browse Source 
Convert #include <asm... to #include <linux...
Spacing cleanups
Mostly 80 column wrapped
Move trailing statements to new lines
switch/case cleanups

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2010-01-26 11:40:18 +00:00
committed by David S. Miller
parent 0ec96e656f
commit b7d9371bef
1 changed files with 125 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
net/atm/svc.c
View File

@@ -19,14 +19,15 @@
#include <linux/atmdev.h> #include <linux/atmdev.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <net/sock.h> /* for sock_no_* */ #include <net/sock.h> /* for sock_no_* */
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include "resources.h" #include "resources.h"
#include "common.h" /* common for PVCs and SVCs */ #include "common.h" /* common for PVCs and SVCs */
#include "signaling.h" #include "signaling.h"
#include "addr.h" #include "addr.h"
static int svc_create(struct net *net, struct socket *sock, int protocol, int kern); static int svc_create(struct net *net, struct socket *sock, int protocol,
int kern);
/* /*
* Note: since all this is still nicely synchronized with the signaling demon, * Note: since all this is still nicely synchronized with the signaling demon,
@@ -40,7 +41,6 @@ static int svc_shutdown(struct socket *sock,int how)
return 0; return 0;
} }
static void svc_disconnect(struct atm_vcc *vcc) static void svc_disconnect(struct atm_vcc *vcc)
{ {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
@@ -53,7 +53,8 @@ static void svc_disconnect(struct atm_vcc *vcc)
sigd_enq(vcc, as_close, NULL, NULL, NULL); sigd_enq(vcc, as_close, NULL, NULL, NULL);
while (!test_bit(ATM_VF_RELEASED, &vcc->flags) && sigd) { while (!test_bit(ATM_VF_RELEASED, &vcc->flags) && sigd) {
schedule(); schedule();
prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait,
TASK_UNINTERRUPTIBLE);
} }
finish_wait(sk->sk_sleep, &wait); finish_wait(sk->sk_sleep, &wait);
} }
@@ -69,7 +70,6 @@ static void svc_disconnect(struct atm_vcc *vcc)
/* ... may retry later */ /* ... may retry later */
} }
static int svc_release(struct socket *sock) static int svc_release(struct socket *sock)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
@@ -79,16 +79,17 @@ static int svc_release(struct socket *sock)
vcc = ATM_SD(sock); vcc = ATM_SD(sock);
pr_debug("%p\n", vcc); pr_debug("%p\n", vcc);
clear_bit(ATM_VF_READY, &vcc->flags); clear_bit(ATM_VF_READY, &vcc->flags);
/* VCC pointer is used as a reference, so we must not free it /*
(thereby subjecting it to re-use) before all pending connections * VCC pointer is used as a reference,
are closed */ * so we must not free it (thereby subjecting it to re-use)
* before all pending connections are closed
*/
svc_disconnect(vcc); svc_disconnect(vcc);
vcc_release(sock); vcc_release(sock);
} }
return 0; return 0;
} }
static int svc_bind(struct socket *sock, struct sockaddr *sockaddr, static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,
int sockaddr_len) int sockaddr_len)
{ {
@@ -144,7 +145,6 @@ out:
return error; return error;
} }
static int svc_connect(struct socket *sock, struct sockaddr *sockaddr, static int svc_connect(struct socket *sock, struct sockaddr *sockaddr,
int sockaddr_len, int flags) int sockaddr_len, int flags)
{ {
@@ -213,7 +213,8 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
schedule(); schedule();
if (!signal_pending(current)) { if (!signal_pending(current)) {
prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait,
TASK_INTERRUPTIBLE);
continue; continue;
} }
pr_debug("*ABORT*\n"); pr_debug("*ABORT*\n");
@@ -231,13 +232,15 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
*/ */
sigd_enq(vcc, as_close, NULL, NULL, NULL); sigd_enq(vcc, as_close, NULL, NULL, NULL);
while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait,
TASK_INTERRUPTIBLE);
schedule(); schedule();
} }
if (!sk->sk_err) if (!sk->sk_err)
while (!test_bit(ATM_VF_RELEASED,&vcc->flags) while (!test_bit(ATM_VF_RELEASED, &vcc->flags) &&
&& sigd) { sigd) {
prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait,
TASK_INTERRUPTIBLE);
schedule(); schedule();
} }
clear_bit(ATM_VF_REGIS, &vcc->flags); clear_bit(ATM_VF_REGIS, &vcc->flags);
@@ -270,7 +273,8 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
/* /*
* #endif * #endif
*/ */
if (!(error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci))) error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci);
if (!error)
sock->state = SS_CONNECTED; sock->state = SS_CONNECTED;
else else
(void)svc_disconnect(vcc); (void)svc_disconnect(vcc);
@@ -279,7 +283,6 @@ out:
return error; return error;
} }
static int svc_listen(struct socket *sock, int backlog) static int svc_listen(struct socket *sock, int backlog)
{ {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
@@ -319,7 +322,6 @@ out:
return error; return error;
} }
static int svc_accept(struct socket *sock, struct socket *newsock, int flags) static int svc_accept(struct socket *sock, struct socket *newsock, int flags)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
@@ -344,7 +346,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
while (!(skb = skb_dequeue(&sk->sk_receive_queue)) && while (!(skb = skb_dequeue(&sk->sk_receive_queue)) &&
sigd) { sigd) {
if (test_bit(ATM_VF_RELEASED,&old_vcc->flags)) break; if (test_bit(ATM_VF_RELEASED, &old_vcc->flags))
break;
if (test_bit(ATM_VF_CLOSE, &old_vcc->flags)) { if (test_bit(ATM_VF_CLOSE, &old_vcc->flags)) {
error = -sk->sk_err; error = -sk->sk_err;
break; break;
@@ -360,7 +363,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
error = -ERESTARTSYS; error = -ERESTARTSYS;
break; break;
} }
prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait,
TASK_INTERRUPTIBLE);
} }
finish_wait(sk->sk_sleep, &wait); finish_wait(sk->sk_sleep, &wait);
if (error) if (error)
@@ -376,7 +380,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
new_vcc->local = msg->local; new_vcc->local = msg->local;
new_vcc->sap = msg->sap; new_vcc->sap = msg->sap;
error = vcc_connect(newsock, msg->pvc.sap_addr.itf, error = vcc_connect(newsock, msg->pvc.sap_addr.itf,
msg->pvc.sap_addr.vpi, msg->pvc.sap_addr.vci); msg->pvc.sap_addr.vpi,
msg->pvc.sap_addr.vci);
dev_kfree_skb(skb); dev_kfree_skb(skb);
sk->sk_ack_backlog--; sk->sk_ack_backlog--;
if (error) { if (error) {
@@ -387,13 +392,15 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
} }
/* wait should be short, so we ignore the non-blocking flag */ /* wait should be short, so we ignore the non-blocking flag */
set_bit(ATM_VF_WAITING, &new_vcc->flags); set_bit(ATM_VF_WAITING, &new_vcc->flags);
prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait,
TASK_UNINTERRUPTIBLE);
sigd_enq(new_vcc, as_accept, old_vcc, NULL, NULL); sigd_enq(new_vcc, as_accept, old_vcc, NULL, NULL);
while (test_bit(ATM_VF_WAITING, &new_vcc->flags) && sigd) { while (test_bit(ATM_VF_WAITING, &new_vcc->flags) && sigd) {
release_sock(sk); release_sock(sk);
schedule(); schedule();
lock_sock(sk); lock_sock(sk);
prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait,
TASK_UNINTERRUPTIBLE);
} }
finish_wait(sk_atm(new_vcc)->sk_sleep, &wait); finish_wait(sk_atm(new_vcc)->sk_sleep, &wait);
if (!sigd) { if (!sigd) {
@@ -413,7 +420,6 @@ out:
return error; return error;
} }
static int svc_getname(struct socket *sock, struct sockaddr *sockaddr, static int svc_getname(struct socket *sock, struct sockaddr *sockaddr,
int *sockaddr_len, int peer) int *sockaddr_len, int peer)
{ {
@@ -426,7 +432,6 @@ static int svc_getname(struct socket *sock,struct sockaddr *sockaddr,
return 0; return 0;
} }
int svc_change_qos(struct atm_vcc *vcc, struct atm_qos *qos) int svc_change_qos(struct atm_vcc *vcc, struct atm_qos *qos)
{ {
struct sock *sk = sk_atm(vcc); struct sock *sk = sk_atm(vcc);
@@ -441,11 +446,11 @@ int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos)
prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
} }
finish_wait(sk->sk_sleep, &wait); finish_wait(sk->sk_sleep, &wait);
if (!sigd) return -EUNATCH; if (!sigd)
return -EUNATCH;
return -sk->sk_err; return -sk->sk_err;
} }
static int svc_setsockopt(struct socket *sock, int level, int optname, static int svc_setsockopt(struct socket *sock, int level, int optname,
char __user *optval, unsigned int optlen) char __user *optval, unsigned int optlen)
{ {
@@ -475,17 +480,15 @@ static int svc_setsockopt(struct socket *sock, int level, int optname,
error = -EFAULT; error = -EFAULT;
goto out; goto out;
} }
if (value == 1) { if (value == 1)
set_bit(ATM_VF_SESSION, &vcc->flags); set_bit(ATM_VF_SESSION, &vcc->flags);
} else if (value == 0) { else if (value == 0)
clear_bit(ATM_VF_SESSION, &vcc->flags); clear_bit(ATM_VF_SESSION, &vcc->flags);
} else { else
error = -EINVAL; error = -EINVAL;
}
break; break;
default: default:
error = vcc_setsockopt(sock, level, optname, error = vcc_setsockopt(sock, level, optname, optval, optlen);
optval, optlen);
} }
out: out:
@@ -493,7 +496,6 @@ out:
return error; return error;
} }
static int svc_getsockopt(struct socket *sock, int level, int optname, static int svc_getsockopt(struct socket *sock, int level, int optname,
char __user *optval, int __user *optlen) char __user *optval, int __user *optlen)
{ {
@@ -522,7 +524,6 @@ out:
return error; return error;
} }
static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr, static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr,
int sockaddr_len, int flags) int sockaddr_len, int flags)
{ {
@@ -553,7 +554,6 @@ out:
return error; return error;
} }
static int svc_dropparty(struct socket *sock, int ep_ref) static int svc_dropparty(struct socket *sock, int ep_ref)
{ {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
@@ -580,7 +580,6 @@ out:
return error; return error;
} }
static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{ {
int error, ep_ref; int error, ep_ref;
@@ -593,7 +592,8 @@ static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return -EINVAL; return -EINVAL;
if (copy_from_user(&sa, (void __user *) arg, sizeof(sa))) if (copy_from_user(&sa, (void __user *) arg, sizeof(sa)))
return -EFAULT; return -EFAULT;
error = svc_addparty(sock, (struct sockaddr *) &sa, sizeof(sa), 0); error = svc_addparty(sock, (struct sockaddr *)&sa, sizeof(sa),
0);
break; break;
case ATM_DROPPARTY: case ATM_DROPPARTY:
if (!test_bit(ATM_VF_SESSION, &vcc->flags)) if (!test_bit(ATM_VF_SESSION, &vcc->flags))
@@ -610,7 +610,8 @@ static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static int svc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) static int svc_compat_ioctl(struct socket *sock, unsigned int cmd,
unsigned long arg)
{ {
/* The definition of ATM_ADDPARTY uses the size of struct atm_iobuf. /* The definition of ATM_ADDPARTY uses the size of struct atm_iobuf.
But actually it takes a struct sockaddr_atmsvc, which doesn't need But actually it takes a struct sockaddr_atmsvc, which doesn't need
@@ -661,13 +662,13 @@ static int svc_create(struct net *net, struct socket *sock, int protocol,
sock->ops = &svc_proto_ops; sock->ops = &svc_proto_ops;
error = vcc_create(net, sock, protocol, AF_ATMSVC); error = vcc_create(net, sock, protocol, AF_ATMSVC);
if (error) return error; if (error)
return error;
ATM_SD(sock)->local.sas_family = AF_ATMSVC; ATM_SD(sock)->local.sas_family = AF_ATMSVC;
ATM_SD(sock)->remote.sas_family = AF_ATMSVC; ATM_SD(sock)->remote.sas_family = AF_ATMSVC;
return 0; return 0;
} }
static const struct net_proto_family svc_family_ops = { static const struct net_proto_family svc_family_ops = {
.family = PF_ATMSVC, .family = PF_ATMSVC,
.create = svc_create, .create = svc_create,