Skip to content

L
linux
Commit 07b54c9a authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

net/atm/resources.c: checkpatch cleanups 

Spacing cleanups
Mostly 80 column wrapped.
Move embedded assigns out of tests
Move trailing statements to new lines
switch/case cleanups
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa61f0ca
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 198 deletions
net/atm/resources.c
View file @ 07b54c9a
...@@ -71,7 +71,7 @@ struct atm_dev *atm_dev_lookup(int number) ...@@ -71,7 +71,7 @@ struct atm_dev *atm_dev_lookup(int number)
mutex_unlock(&atm_dev_mutex); mutex_unlock(&atm_dev_mutex);
return dev; return dev;
} }
EXPORT_SYMBOL(atm_dev_lookup);
struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
int number, unsigned long *flags) int number, unsigned long *flags)
...@@ -85,7 +85,8 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, ...@@ -85,7 +85,8 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
} }
mutex_lock(&atm_dev_mutex); mutex_lock(&atm_dev_mutex);
if (number != -1) { if (number != -1) {
if ((inuse = __atm_dev_lookup(number))) { inuse = __atm_dev_lookup(number);
if (inuse) {
atm_dev_put(inuse); atm_dev_put(inuse);
mutex_unlock(&atm_dev_mutex); mutex_unlock(&atm_dev_mutex);
kfree(dev); kfree(dev);
...@@ -130,7 +131,7 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, ...@@ -130,7 +131,7 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
dev = NULL; dev = NULL;
goto out; goto out;
} }
EXPORT_SYMBOL(atm_dev_register);
void atm_dev_deregister(struct atm_dev *dev) void atm_dev_deregister(struct atm_dev *dev)
{ {
...@@ -152,7 +153,7 @@ void atm_dev_deregister(struct atm_dev *dev) ...@@ -152,7 +153,7 @@ void atm_dev_deregister(struct atm_dev *dev)
atm_dev_put(dev); atm_dev_put(dev);
} }
EXPORT_SYMBOL(atm_dev_deregister);
static void copy_aal_stats(struct k_atm_aal_stats *from, static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to) struct atm_aal_stats *to)
...@@ -162,7 +163,6 @@ static void copy_aal_stats(struct k_atm_aal_stats *from, ...@@ -162,7 +163,6 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
#undef __HANDLE_ITEM #undef __HANDLE_ITEM
} }
static void subtract_aal_stats(struct k_atm_aal_stats *from, static void subtract_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to) struct atm_aal_stats *to)
{ {
...@@ -171,8 +171,8 @@ static void subtract_aal_stats(struct k_atm_aal_stats *from, ...@@ -171,8 +171,8 @@ static void subtract_aal_stats(struct k_atm_aal_stats *from,
#undef __HANDLE_ITEM #undef __HANDLE_ITEM
} }
static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg,
static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, int zero) int zero)
{ {
struct atm_dev_stats tmp; struct atm_dev_stats tmp;
int error = 0; int error = 0;
...@@ -190,7 +190,6 @@ static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, in ...@@ -190,7 +190,6 @@ static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, in
return error ? -EFAULT : 0; return error ? -EFAULT : 0;
} }
int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
{ {
void __user *buf; void __user *buf;
...@@ -206,50 +205,49 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) ...@@ -206,50 +205,49 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
#endif #endif
switch (cmd) { switch (cmd) {
case ATM_GETNAMES: case ATM_GETNAMES:
if (compat) {
if (compat) {
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
struct compat_atm_iobuf __user *ciobuf = arg; struct compat_atm_iobuf __user *ciobuf = arg;
compat_uptr_t cbuf; compat_uptr_t cbuf;
iobuf_len = &ciobuf->length; iobuf_len = &ciobuf->length;
if (get_user(cbuf, &ciobuf->buffer)) if (get_user(cbuf, &ciobuf->buffer))
return -EFAULT; return -EFAULT;
buf = compat_ptr(cbuf); buf = compat_ptr(cbuf);
#endif #endif
} else { } else {
struct atm_iobuf __user *iobuf = arg; struct atm_iobuf __user *iobuf = arg;
iobuf_len = &iobuf->length; iobuf_len = &iobuf->length;
if (get_user(buf, &iobuf->buffer)) if (get_user(buf, &iobuf->buffer))
return -EFAULT;
}
if (get_user(len, iobuf_len))
return -EFAULT; return -EFAULT;
mutex_lock(&atm_dev_mutex); }
list_for_each(p, &atm_devs) if (get_user(len, iobuf_len))
size += sizeof(int); return -EFAULT;
if (size > len) { mutex_lock(&atm_dev_mutex);
mutex_unlock(&atm_dev_mutex); list_for_each(p, &atm_devs)
return -E2BIG; size += sizeof(int);
} if (size > len) {
tmp_buf = kmalloc(size, GFP_ATOMIC);
if (!tmp_buf) {
mutex_unlock(&atm_dev_mutex);
return -ENOMEM;
}
tmp_p = tmp_buf;
list_for_each(p, &atm_devs) {
dev = list_entry(p, struct atm_dev, dev_list);
*tmp_p++ = dev->number;
}
mutex_unlock(&atm_dev_mutex); mutex_unlock(&atm_dev_mutex);
error = ((copy_to_user(buf, tmp_buf, size)) || return -E2BIG;
put_user(size, iobuf_len)) }
? -EFAULT : 0; tmp_buf = kmalloc(size, GFP_ATOMIC);
kfree(tmp_buf); if (!tmp_buf) {
return error; mutex_unlock(&atm_dev_mutex);
default: return -ENOMEM;
break; }
tmp_p = tmp_buf;
list_for_each(p, &atm_devs) {
dev = list_entry(p, struct atm_dev, dev_list);
*tmp_p++ = dev->number;
}
mutex_unlock(&atm_dev_mutex);
error = ((copy_to_user(buf, tmp_buf, size)) ||
put_user(size, iobuf_len))
? -EFAULT : 0;
kfree(tmp_buf);
return error;
default:
break;
} }
if (compat) { if (compat) {
...@@ -278,166 +276,167 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) ...@@ -278,166 +276,167 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
if (get_user(number, &sioc->number)) if (get_user(number, &sioc->number))
return -EFAULT; return -EFAULT;
} }
if (!(dev = try_then_request_module(atm_dev_lookup(number),
"atm-device-%d", number))) dev = try_then_request_module(atm_dev_lookup(number), "atm-device-%d",
number);
if (!dev)
return -ENODEV; return -ENODEV;
switch (cmd) { switch (cmd) {
case ATM_GETTYPE: case ATM_GETTYPE:
size = strlen(dev->type) + 1; size = strlen(dev->type) + 1;
if (copy_to_user(buf, dev->type, size)) { if (copy_to_user(buf, dev->type, size)) {
error = -EFAULT; error = -EFAULT;
goto done; goto done;
} }
break; break;
case ATM_GETESI: case ATM_GETESI:
size = ESI_LEN; size = ESI_LEN;
if (copy_to_user(buf, dev->esi, size)) { if (copy_to_user(buf, dev->esi, size)) {
error = -EFAULT; error = -EFAULT;
goto done; goto done;
} }
break; break;
case ATM_SETESI: case ATM_SETESI:
{ {
int i; int i;
for (i = 0; i < ESI_LEN; i++) for (i = 0; i < ESI_LEN; i++)
if (dev->esi[i]) { if (dev->esi[i]) {
error = -EEXIST; error = -EEXIST;
goto done;
}
}
/* fall through */
case ATM_SETESIF:
{
unsigned char esi[ESI_LEN];
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
if (copy_from_user(esi, buf, ESI_LEN)) {
error = -EFAULT;
goto done;
}
memcpy(dev->esi, esi, ESI_LEN);
error = ESI_LEN;
goto done;
}
case ATM_GETSTATZ:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
/* fall through */
case ATM_GETSTAT:
size = sizeof(struct atm_dev_stats);
error = fetch_stats(dev, buf, cmd == ATM_GETSTATZ);
if (error)
goto done;
break;
case ATM_GETCIRANGE:
size = sizeof(struct atm_cirange);
if (copy_to_user(buf, &dev->ci_range, size)) {
error = -EFAULT;
goto done;
}
break;
case ATM_GETLINKRATE:
size = sizeof(int);
if (copy_to_user(buf, &dev->link_rate, size)) {
error = -EFAULT;
goto done;
}
break;
case ATM_RSTADDR:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
atm_reset_addr(dev, ATM_ADDR_LOCAL);
break;
case ATM_ADDADDR:
case ATM_DELADDR:
case ATM_ADDLECSADDR:
case ATM_DELLECSADDR:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
{
struct sockaddr_atmsvc addr;
if (copy_from_user(&addr, buf, sizeof(addr))) {
error = -EFAULT;
goto done;
}
if (cmd == ATM_ADDADDR || cmd == ATM_ADDLECSADDR)
error = atm_add_addr(dev, &addr,
(cmd == ATM_ADDADDR ?
ATM_ADDR_LOCAL : ATM_ADDR_LECS));
else
error = atm_del_addr(dev, &addr,
(cmd == ATM_DELADDR ?
ATM_ADDR_LOCAL : ATM_ADDR_LECS));
goto done; goto done;
} }
case ATM_GETADDR: }
case ATM_GETLECSADDR: /* fall through */
error = atm_get_addr(dev, buf, len, case ATM_SETESIF:
(cmd == ATM_GETADDR ? {
unsigned char esi[ESI_LEN];
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
if (copy_from_user(esi, buf, ESI_LEN)) {
error = -EFAULT;
goto done;
}
memcpy(dev->esi, esi, ESI_LEN);
error = ESI_LEN;
goto done;
}
case ATM_GETSTATZ:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
/* fall through */
case ATM_GETSTAT:
size = sizeof(struct atm_dev_stats);
error = fetch_stats(dev, buf, cmd == ATM_GETSTATZ);
if (error)
goto done;
break;
case ATM_GETCIRANGE:
size = sizeof(struct atm_cirange);
if (copy_to_user(buf, &dev->ci_range, size)) {
error = -EFAULT;
goto done;
}
break;
case ATM_GETLINKRATE:
size = sizeof(int);
if (copy_to_user(buf, &dev->link_rate, size)) {
error = -EFAULT;
goto done;
}
break;
case ATM_RSTADDR:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
atm_reset_addr(dev, ATM_ADDR_LOCAL);
break;
case ATM_ADDADDR:
case ATM_DELADDR:
case ATM_ADDLECSADDR:
case ATM_DELLECSADDR:
{
struct sockaddr_atmsvc addr;
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
if (copy_from_user(&addr, buf, sizeof(addr))) {
error = -EFAULT;
goto done;
}
if (cmd == ATM_ADDADDR || cmd == ATM_ADDLECSADDR)
error = atm_add_addr(dev, &addr,
(cmd == ATM_ADDADDR ?
ATM_ADDR_LOCAL : ATM_ADDR_LECS)); ATM_ADDR_LOCAL : ATM_ADDR_LECS));
if (error < 0) else
goto done; error = atm_del_addr(dev, &addr,
size = error; (cmd == ATM_DELADDR ?
/* may return 0, but later on size == 0 means "don't ATM_ADDR_LOCAL : ATM_ADDR_LECS));
write the length" */ goto done;
error = put_user(size, sioc_len) }
? -EFAULT : 0; case ATM_GETADDR:
case ATM_GETLECSADDR:
error = atm_get_addr(dev, buf, len,
(cmd == ATM_GETADDR ?
ATM_ADDR_LOCAL : ATM_ADDR_LECS));
if (error < 0)
goto done;
size = error;
/* may return 0, but later on size == 0 means "don't
write the length" */
error = put_user(size, sioc_len) ? -EFAULT : 0;
goto done;
case ATM_SETLOOP:
if (__ATM_LM_XTRMT((int) (unsigned long) buf) &&
__ATM_LM_XTLOC((int) (unsigned long) buf) >
__ATM_LM_XTRMT((int) (unsigned long) buf)) {
error = -EINVAL;
goto done; goto done;
case ATM_SETLOOP: }
if (__ATM_LM_XTRMT((int) (unsigned long) buf) && /* fall through */
__ATM_LM_XTLOC((int) (unsigned long) buf) > case ATM_SETCIRANGE:
__ATM_LM_XTRMT((int) (unsigned long) buf)) { case SONET_GETSTATZ:
case SONET_SETDIAG:
case SONET_CLRDIAG:
case SONET_SETFRAMING:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
/* fall through */
default:
if (compat) {
#ifdef CONFIG_COMPAT
if (!dev->ops->compat_ioctl) {
error = -EINVAL; error = -EINVAL;
goto done; goto done;
} }
/* fall through */ size = dev->ops->compat_ioctl(dev, cmd, buf);
case ATM_SETCIRANGE:
case SONET_GETSTATZ:
case SONET_SETDIAG:
case SONET_CLRDIAG:
case SONET_SETFRAMING:
if (!capable(CAP_NET_ADMIN)) {
error = -EPERM;
goto done;
}
/* fall through */
default:
if (compat) {
#ifdef CONFIG_COMPAT
if (!dev->ops->compat_ioctl) {
error = -EINVAL;
goto done;
}
size = dev->ops->compat_ioctl(dev, cmd, buf);
#endif #endif
} else { } else {
if (!dev->ops->ioctl) { if (!dev->ops->ioctl) {
error = -EINVAL; error = -EINVAL;
goto done;
}
size = dev->ops->ioctl(dev, cmd, buf);
}
if (size < 0) {
error = (size == -ENOIOCTLCMD ? -EINVAL : size);
goto done; goto done;
} }
size = dev->ops->ioctl(dev, cmd, buf);
}
if (size < 0) {
error = (size == -ENOIOCTLCMD ? -EINVAL : size);
goto done;
}
} }
if (size) if (size)
error = put_user(size, sioc_len) error = put_user(size, sioc_len) ? -EFAULT : 0;
? -EFAULT : 0;
else else
error = 0; error = 0;
done: done:
...@@ -445,7 +444,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) ...@@ -445,7 +444,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
return error; return error;
} }
static __inline__ void *dev_get_idx(loff_t left) static inline void *dev_get_idx(loff_t left)
{ {
struct list_head *p; struct list_head *p;
...@@ -474,8 +473,3 @@ void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -474,8 +473,3 @@ void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
? atm_devs.next : ((struct list_head *)v)->next; ? atm_devs.next : ((struct list_head *)v)->next;
return (v == &atm_devs) ? NULL : v; return (v == &atm_devs) ? NULL : v;
} }
EXPORT_SYMBOL(atm_dev_register);
EXPORT_SYMBOL(atm_dev_deregister);
EXPORT_SYMBOL(atm_dev_lookup);
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7