]> xenbits.xensource.com Git - linux-pvops.git/commitdiff
net/9p: Fix the msize calculation.
authorVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>
Thu, 30 Jun 2011 01:06:33 +0000 (18:06 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Nov 2011 20:32:00 +0000 (12:32 -0800)
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>
net/9p/client.c

index 6b58ef30696cec5aa2d156edfe7fb1352c52a78b..a0c407efa41aa320ec794fc92634d317d0acd6d2 100644 (file)
@@ -698,8 +698,8 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
        if (err)
                goto error;
 
-       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)