summaryrefslogtreecommitdiffstats
path: root/net/9p/client.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-15 08:36:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-15 08:36:41 +0100
commit83be46e944f630fde26ce03cb93f61a3066448e3 (patch)
treed94a48051f9311d99b615fa06adda2511f9cff2d /net/9p/client.c
parentf8096ff38d5f62d8a2c473e1bec0163a1b2b86d8 (diff)
parent1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff)
downloadlinux-83be46e944f630fde26ce03cb93f61a3066448e3.tar.bz2
Merge v5.12-rc3 into char-misc-next
We need the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/9p/client.c')
-rw-r--r--net/9p/client.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/9p/client.c b/net/9p/client.c
index 4f62f299da0c..0a9019da18f3 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1623,10 +1623,6 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,
}
p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", count);
- if (!count) {
- p9_tag_remove(clnt, req);
- return 0;
- }
if (non_zc) {
int n = copy_to_iter(dataptr, count, to);