tun: remove useless codes in tun_chr_aio_read() and tun_recvmsg()
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
41e4af69a5
Коммит
73713357ab
|
@ -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,
|
ret = tun_do_read(tun, tfile, iv, len,
|
||||||
file->f_flags & O_NONBLOCK);
|
file->f_flags & O_NONBLOCK);
|
||||||
ret = min_t(ssize_t, ret, len);
|
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
iocb->ki_pos = ret;
|
iocb->ki_pos = ret;
|
||||||
out:
|
out:
|
||||||
|
@ -1455,10 +1454,6 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||||
}
|
}
|
||||||
ret = tun_do_read(tun, tfile, m->msg_iov, total_len,
|
ret = tun_do_read(tun, tfile, m->msg_iov, total_len,
|
||||||
flags & MSG_DONTWAIT);
|
flags & MSG_DONTWAIT);
|
||||||
if (ret > total_len) {
|
|
||||||
m->msg_flags |= MSG_TRUNC;
|
|
||||||
ret = flags & MSG_TRUNC ? ret : total_len;
|
|
||||||
}
|
|
||||||
out:
|
out:
|
||||||
tun_put(tun);
|
tun_put(tun);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче