From: Zhi Yong Wu <zwu.kernel@gmail.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Subject: [PATCH 2/2] tun: remove useless codes in tun_chr_aio_read() and tun_recvmsg()
Date: Sat, 7 Dec 2013 04:55:00 +0800 [thread overview]
Message-ID: <1386363300-19040-2-git-send-email-zwu.kernel@gmail.com> (raw)
In-Reply-To: <1386363300-19040-1-git-send-email-zwu.kernel@gmail.com>
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
By checking related codes, it is impossible that ret > len or total_len,
so we should remove some useless codes in both above functions.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/tun.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index f9c935a..d61719c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1354,7 +1354,6 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
ret = tun_do_read(tun, tfile, iv, len,
file->f_flags & O_NONBLOCK);
- ret = min_t(ssize_t, ret, len);
out:
tun_put(tun);
return ret;
@@ -1453,10 +1452,6 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
}
ret = tun_do_read(tun, tfile, m->msg_iov, total_len,
flags & MSG_DONTWAIT);
- if (ret > total_len) {
- m->msg_flags |= MSG_TRUNC;
- ret = flags & MSG_TRUNC ? ret : total_len;
- }
out:
tun_put(tun);
return ret;
--
1.7.6.5
next prev parent reply other threads:[~2013-12-06 20:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-06 20:54 [PATCH 1/2] macvtap: remove useless codes in macvtap_aio_read() and macvtap_recvmsg() Zhi Yong Wu
2013-12-06 20:55 ` Zhi Yong Wu [this message]
2013-12-10 1:36 ` [PATCH 2/2] tun: remove useless codes in tun_chr_aio_read() and tun_recvmsg() David Miller
2013-12-10 17:18 ` Vlad Yasevich
2013-12-10 19:00 ` David Miller
2013-12-11 3:14 ` Zhi Yong Wu
2013-12-11 3:19 ` David Miller
2013-12-11 3:24 ` Zhi Yong Wu
2013-12-07 2:38 ` [PATCH 1/2] macvtap: remove useless codes in macvtap_aio_read() and macvtap_recvmsg() Vlad Yasevich
2013-12-09 3:30 ` Jason Wang
2013-12-10 1:36 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386363300-19040-2-git-send-email-zwu.kernel@gmail.com \
--to=zwu.kernel@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wuzhy@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.