* [PATCH v4 net-next 0/4] net: some cleanups
@ 2013-12-06 20:13 Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 1/4] vhost: remove the dead branch Zhi Yong Wu
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 20:13 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Since net-next is open now, it's time to post them out again.
Changelog from v3:
-combine the change that removes the return value check with
the change which adjusts the function return type to "void". [David Miller]
Zhi Yong Wu (4):
vhost: remove the dead branch
macvtap: remove the dead branch
macvtap: remove unused parameter in macvtap_do_read()
tun: remove unused parameter in tun_do_read()
drivers/net/macvtap.c | 14 +++++---------
drivers/net/tun.c | 7 +++----
drivers/vhost/net.c | 9 ++-------
drivers/vhost/scsi.c | 7 +------
drivers/vhost/test.c | 8 +-------
drivers/vhost/vhost.c | 4 +---
drivers/vhost/vhost.h | 2 +-
7 files changed, 14 insertions(+), 37 deletions(-)
--
1.7.6.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 net-next 1/4] vhost: remove the dead branch
2013-12-06 20:13 [PATCH v4 net-next 0/4] net: some cleanups Zhi Yong Wu
@ 2013-12-06 20:13 ` Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 2/4] macvtap: " Zhi Yong Wu
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 20:13 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Since vhost_dev_init() forever return 0, some branches are never run,
therefore need to be removed.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/net.c | 9 ++-------
drivers/vhost/scsi.c | 7 +------
drivers/vhost/test.c | 8 +-------
drivers/vhost/vhost.c | 4 +---
drivers/vhost/vhost.h | 2 +-
5 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 831eb4f..9a68409 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -683,7 +683,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
struct vhost_net *n = kmalloc(sizeof *n, GFP_KERNEL);
struct vhost_dev *dev;
struct vhost_virtqueue **vqs;
- int r, i;
+ int i;
if (!n)
return -ENOMEM;
@@ -706,12 +706,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
n->vqs[i].vhost_hlen = 0;
n->vqs[i].sock_hlen = 0;
}
- r = vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
- if (r < 0) {
- kfree(n);
- kfree(vqs);
- return r;
- }
+ vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index f175629..1e4c75c 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1417,18 +1417,13 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
vqs[i] = &vs->vqs[i].vq;
vs->vqs[i].vq.handle_kick = vhost_scsi_handle_kick;
}
- r = vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
+ vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
tcm_vhost_init_inflight(vs, NULL);
- if (r < 0)
- goto err_init;
-
f->private_data = vs;
return 0;
-err_init:
- kfree(vqs);
err_vqs:
vhost_scsi_free(vs);
err_vs:
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 339eae8..c2a54fb 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -104,7 +104,6 @@ static int vhost_test_open(struct inode *inode, struct file *f)
struct vhost_test *n = kmalloc(sizeof *n, GFP_KERNEL);
struct vhost_dev *dev;
struct vhost_virtqueue **vqs;
- int r;
if (!n)
return -ENOMEM;
@@ -117,12 +116,7 @@ static int vhost_test_open(struct inode *inode, struct file *f)
dev = &n->dev;
vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
- r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
- if (r < 0) {
- kfree(vqs);
- kfree(n);
- return r;
- }
+ vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
f->private_data = n;
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 69068e0..78987e4 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -290,7 +290,7 @@ static void vhost_dev_free_iovecs(struct vhost_dev *dev)
vhost_vq_free_iovecs(dev->vqs[i]);
}
-long vhost_dev_init(struct vhost_dev *dev,
+void vhost_dev_init(struct vhost_dev *dev,
struct vhost_virtqueue **vqs, int nvqs)
{
struct vhost_virtqueue *vq;
@@ -319,8 +319,6 @@ long vhost_dev_init(struct vhost_dev *dev,
vhost_poll_init(&vq->poll, vq->handle_kick,
POLLIN, dev);
}
-
- return 0;
}
EXPORT_SYMBOL_GPL(vhost_dev_init);
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 4465ed5..35eeb2a 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -127,7 +127,7 @@ struct vhost_dev {
struct task_struct *worker;
};
-long vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue **vqs, int nvqs);
+void vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue **vqs, int nvqs);
long vhost_dev_set_owner(struct vhost_dev *dev);
bool vhost_dev_has_owner(struct vhost_dev *dev);
long vhost_dev_check_owner(struct vhost_dev *);
--
1.7.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 net-next 2/4] macvtap: remove the dead branch
2013-12-06 20:13 [PATCH v4 net-next 0/4] net: some cleanups Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 1/4] vhost: remove the dead branch Zhi Yong Wu
@ 2013-12-06 20:13 ` Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 3/4] macvtap: remove unused parameter in macvtap_do_read() Zhi Yong Wu
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 20:13 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/macvtap.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 9093004..f599c47 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -588,7 +588,7 @@ static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb,
return 0;
}
-static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
+static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
struct virtio_net_hdr *vnet_hdr)
{
memset(vnet_hdr, 0, sizeof(*vnet_hdr));
@@ -619,8 +619,6 @@ static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
} else if (skb->ip_summed == CHECKSUM_UNNECESSARY) {
vnet_hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID;
} /* else everything is zero */
-
- return 0;
}
/* Get packet from user space buffer */
@@ -778,9 +776,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
if ((len -= vnet_hdr_len) < 0)
return -EINVAL;
- ret = macvtap_skb_to_vnet_hdr(skb, &vnet_hdr);
- if (ret)
- return ret;
+ macvtap_skb_to_vnet_hdr(skb, &vnet_hdr);
if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
return -EFAULT;
--
1.7.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 net-next 3/4] macvtap: remove unused parameter in macvtap_do_read()
2013-12-06 20:13 [PATCH v4 net-next 0/4] net: some cleanups Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 1/4] vhost: remove the dead branch Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 2/4] macvtap: " Zhi Yong Wu
@ 2013-12-06 20:13 ` Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 4/4] tun: remove unused parameter in tun_do_read() Zhi Yong Wu
2013-12-06 20:22 ` [PATCH v4 net-next 0/4] net: some cleanups David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 20:13 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/macvtap.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index f599c47..4c6f84c 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -819,7 +819,7 @@ done:
return ret ? ret : copied;
}
-static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
+static ssize_t macvtap_do_read(struct macvtap_queue *q,
const struct iovec *iv, unsigned long len,
int noblock)
{
@@ -870,7 +870,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv,
goto out;
}
- ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
+ ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK);
ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
out:
return ret;
@@ -1102,7 +1102,7 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock,
int ret;
if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))
return -EINVAL;
- ret = macvtap_do_read(q, iocb, m->msg_iov, total_len,
+ ret = macvtap_do_read(q, m->msg_iov, total_len,
flags & MSG_DONTWAIT);
if (ret > total_len) {
m->msg_flags |= MSG_TRUNC;
--
1.7.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 net-next 4/4] tun: remove unused parameter in tun_do_read()
2013-12-06 20:13 [PATCH v4 net-next 0/4] net: some cleanups Zhi Yong Wu
` (2 preceding siblings ...)
2013-12-06 20:13 ` [PATCH v4 net-next 3/4] macvtap: remove unused parameter in macvtap_do_read() Zhi Yong Wu
@ 2013-12-06 20:13 ` Zhi Yong Wu
2013-12-06 20:22 ` [PATCH v4 net-next 0/4] net: some cleanups David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 20:13 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/tun.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 782e38b..f9c935a 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1289,8 +1289,7 @@ done:
}
static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
- struct kiocb *iocb, const struct iovec *iv,
- ssize_t len, int noblock)
+ const struct iovec *iv, ssize_t len, int noblock)
{
DECLARE_WAITQUEUE(wait, current);
struct sk_buff *skb;
@@ -1353,7 +1352,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
goto out;
}
- ret = tun_do_read(tun, tfile, iocb, iv, len,
+ ret = tun_do_read(tun, tfile, iv, len,
file->f_flags & O_NONBLOCK);
ret = min_t(ssize_t, ret, len);
out:
@@ -1452,7 +1451,7 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
SOL_PACKET, TUN_TX_TIMESTAMP);
goto out;
}
- ret = tun_do_read(tun, tfile, iocb, m->msg_iov, total_len,
+ ret = tun_do_read(tun, tfile, m->msg_iov, total_len,
flags & MSG_DONTWAIT);
if (ret > total_len) {
m->msg_flags |= MSG_TRUNC;
--
1.7.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 net-next 0/4] net: some cleanups
2013-12-06 20:13 [PATCH v4 net-next 0/4] net: some cleanups Zhi Yong Wu
` (3 preceding siblings ...)
2013-12-06 20:13 ` [PATCH v4 net-next 4/4] tun: remove unused parameter in tun_do_read() Zhi Yong Wu
@ 2013-12-06 20:22 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-12-06 20:22 UTC (permalink / raw)
To: zwu.kernel; +Cc: netdev, linux-kernel, wuzhy
From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Sat, 7 Dec 2013 04:13:02 +0800
> Since net-next is open now, it's time to post them out again.
>
> Changelog from v3:
> -combine the change that removes the return value check with
> the change which adjusts the function return type to "void". [David Miller]
Looks good, series applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-06 20:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06 20:13 [PATCH v4 net-next 0/4] net: some cleanups Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 1/4] vhost: remove the dead branch Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 2/4] macvtap: " Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 3/4] macvtap: remove unused parameter in macvtap_do_read() Zhi Yong Wu
2013-12-06 20:13 ` [PATCH v4 net-next 4/4] tun: remove unused parameter in tun_do_read() Zhi Yong Wu
2013-12-06 20:22 ` [PATCH v4 net-next 0/4] net: some cleanups David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.