From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: Re: [PATCH 5/6] cifs_readv_receive: use cifs_read_from_socket() Date: Tue, 19 Apr 2016 11:01:06 -0400 Message-ID: <1461078066.15135.0.camel@poochiereds.net> References: <20160409204301.GF25498@ZenIV.linux.org.uk> <20160409205236.GK25498@ZenIV.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Al Viro , linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <20160409205236.GK25498-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org> Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: On Sat, 2016-04-09 at 21:52 +0100, Al Viro wrote: > Signed-off-by: Al Viro > --- > =C2=A0fs/cifs/cifssmb.c | 11 ++++------- > =C2=A01 file changed, 4 insertions(+), 7 deletions(-) >=20 > diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c > index 76fcb50..3da077a 100644 > --- a/fs/cifs/cifssmb.c > +++ b/fs/cifs/cifssmb.c > @@ -1447,10 +1447,8 @@ cifs_readv_receive(struct TCP_Server_Info *ser= ver, struct mid_q_entry *mid) > =C2=A0 len =3D min_t(unsigned int, buflen, server->vals->read_rsp_siz= e) - > =C2=A0 HEADER_SIZE(server) + 1; > =C2=A0 > - rdata->iov.iov_base =3D buf + HEADER_SIZE(server) - 1; > - rdata->iov.iov_len =3D len; > - > - length =3D cifs_readv_from_socket(server, &rdata->iov, 1, len); > + length =3D cifs_read_from_socket(server, > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0buf + HEADER_SIZE(serv= er) - 1, len); > =C2=A0 if (length < 0) > =C2=A0 return length; > =C2=A0 server->total_read +=3D length; > @@ -1502,9 +1500,8 @@ cifs_readv_receive(struct TCP_Server_Info *serv= er, struct mid_q_entry *mid) > =C2=A0 len =3D data_offset - server->total_read; > =C2=A0 if (len > 0) { > =C2=A0 /* read any junk before data into the rest of smallbuf */ > - rdata->iov.iov_base =3D buf + server->total_read; > - rdata->iov.iov_len =3D len; > - length =3D cifs_readv_from_socket(server, &rdata->iov, 1, len); > + length =3D cifs_read_from_socket(server, > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0buf + server->total_r= ead, len); > =C2=A0 if (length < 0) > =C2=A0 return length; > =C2=A0 server->total_read +=3D length; This one is orthogonal to the rest. Looks good though. Reviewed-by: Jeff Layton From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932451AbcDSPBR (ORCPT ); Tue, 19 Apr 2016 11:01:17 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36409 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932323AbcDSPBQ (ORCPT ); Tue, 19 Apr 2016 11:01:16 -0400 Message-ID: <1461078066.15135.0.camel@poochiereds.net> Subject: Re: [PATCH 5/6] cifs_readv_receive: use cifs_read_from_socket() From: Jeff Layton To: Al Viro , linux-cifs@vger.kernel.org Cc: linux-kernel@vger.kernel.org Date: Tue, 19 Apr 2016 11:01:06 -0400 In-Reply-To: <20160409205236.GK25498@ZenIV.linux.org.uk> References: <20160409204301.GF25498@ZenIV.linux.org.uk> <20160409205236.GK25498@ZenIV.linux.org.uk> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 2016-04-09 at 21:52 +0100, Al Viro wrote: > Signed-off-by: Al Viro > --- >  fs/cifs/cifssmb.c | 11 ++++------- >  1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c > index 76fcb50..3da077a 100644 > --- a/fs/cifs/cifssmb.c > +++ b/fs/cifs/cifssmb.c > @@ -1447,10 +1447,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) >   len = min_t(unsigned int, buflen, server->vals->read_rsp_size) - >   HEADER_SIZE(server) + 1; >   > - rdata->iov.iov_base = buf + HEADER_SIZE(server) - 1; > - rdata->iov.iov_len = len; > - > - length = cifs_readv_from_socket(server, &rdata->iov, 1, len); > + length = cifs_read_from_socket(server, > +        buf + HEADER_SIZE(server) - 1, len); >   if (length < 0) >   return length; >   server->total_read += length; > @@ -1502,9 +1500,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) >   len = data_offset - server->total_read; >   if (len > 0) { >   /* read any junk before data into the rest of smallbuf */ > - rdata->iov.iov_base = buf + server->total_read; > - rdata->iov.iov_len = len; > - length = cifs_readv_from_socket(server, &rdata->iov, 1, len); > + length = cifs_read_from_socket(server, > +        buf + server->total_read, len); >   if (length < 0) >   return length; >   server->total_read += length; This one is orthogonal to the rest. Looks good though. Reviewed-by: Jeff Layton