aboutsummaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>2011-06-29 18:06:33 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:18 -0700
commit8aeae69113b438efadd5b9dda754e60685d8d6c1 (patch)
tree8afe37bbb03bdd072de4e77f5e4ac03981208173 /net/9p
parent926fa0b4b9cd6537f4750642165647aa20cfeae4 (diff)
downloadkernel_samsung_smdk4412-8aeae69113b438efadd5b9dda754e60685d8d6c1.zip
kernel_samsung_smdk4412-8aeae69113b438efadd5b9dda754e60685d8d6c1.tar.gz
kernel_samsung_smdk4412-8aeae69113b438efadd5b9dda754e60685d8d6c1.tar.bz2
net/9p: Fix the msize calculation.
commit c9ffb05ca5b5098d6ea468c909dd384d90da7d54 upstream. msize represents the maximum PDU size that includes P9_IOHDRSZ. Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/client.c b/net/9p/client.c
index d2608ce..5532710 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -822,8 +822,8 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
if (err)
goto destroy_fidpool;
- if ((clnt->msize+P9_IOHDRSZ) > clnt->trans_mod->maxsize)
- clnt->msize = clnt->trans_mod->maxsize-P9_IOHDRSZ;
+ if (clnt->msize > clnt->trans_mod->maxsize)
+ clnt->msize = clnt->trans_mod->maxsize;
err = p9_client_version(clnt);
if (err)