[PATCH] cifs: remove ENOSPC handling in smb_sendv

[PATCH] cifs: remove ENOSPC handling in smb_sendv

[Jeff Layton]

To my knowledge, no one ever reported seeing this pop.

Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 fs/cifs/transport.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index cf8bf69..653bf26 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -179,13 +179,7 @@ smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec,
 		 */
 		rc = kernel_sendmsg(ssocket, &smb_msg, &iov[first_vec],
 				    n_vec - first_vec, remaining);
-		if (rc == -ENOSPC || rc == -EAGAIN) {
-			/*
-			 * Catch if a low level driver returns -ENOSPC. This
-			 * WARN_ON will be removed by 3.10 if no one reports
-			 * seeing this.
-			 */
-			WARN_ON_ONCE(rc == -ENOSPC);
+		if (rc == -EAGAIN) {
 			i++;
 			if (i >= 14 || (!server->noblocksnd && (i > 2))) {
 				cifs_dbg(VFS, "sends on sock %p stuck for 15 seconds\n",
-- 
1.7.11.7

Re: [PATCH] cifs: remove ENOSPC handling in smb_sendv

[Suresh Jayaraman]

On 03/22/2013 06:13 PM, Jeff Layton wrote:
> To my knowledge, no one ever reported seeing this pop.


> Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org>

Seemed to have missed Cc Tag.

> Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  fs/cifs/transport.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> index cf8bf69..653bf26 100644
> --- a/fs/cifs/transport.c
> +++ b/fs/cifs/transport.c
> @@ -179,13 +179,7 @@ smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec,
>  		 */
>  		rc = kernel_sendmsg(ssocket, &smb_msg, &iov[first_vec],
>  				    n_vec - first_vec, remaining);
> -		if (rc == -ENOSPC || rc == -EAGAIN) {
> -			/*
> -			 * Catch if a low level driver returns -ENOSPC. This
> -			 * WARN_ON will be removed by 3.10 if no one reports
> -			 * seeing this.
> -			 */
> -			WARN_ON_ONCE(rc == -ENOSPC);
> +		if (rc == -EAGAIN) {
>  			i++;
>  			if (i >= 14 || (!server->noblocksnd && (i > 2))) {
>  				cifs_dbg(VFS, "sends on sock %p stuck for 15 seconds\n",
> 

Agreed. I have not seen any reports too. Looks good to me.

Acked-by: Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org>

Re: [PATCH] cifs: remove ENOSPC handling in smb_sendv

[Jeff Layton]

On Fri, 22 Mar 2013 19:30:09 +0530
Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:

> On 03/22/2013 06:13 PM, Jeff Layton wrote:
> > To my knowledge, no one ever reported seeing this pop.
> 
> 
> > Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org>
> 
> Seemed to have missed Cc Tag.
> 

Doh!

> > Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > ---
> >  fs/cifs/transport.c | 8 +-------
> >  1 file changed, 1 insertion(+), 7 deletions(-)
> > 
> > diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> > index cf8bf69..653bf26 100644
> > --- a/fs/cifs/transport.c
> > +++ b/fs/cifs/transport.c
> > @@ -179,13 +179,7 @@ smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec,
> >  		 */
> >  		rc = kernel_sendmsg(ssocket, &smb_msg, &iov[first_vec],
> >  				    n_vec - first_vec, remaining);
> > -		if (rc == -ENOSPC || rc == -EAGAIN) {
> > -			/*
> > -			 * Catch if a low level driver returns -ENOSPC. This
> > -			 * WARN_ON will be removed by 3.10 if no one reports
> > -			 * seeing this.
> > -			 */
> > -			WARN_ON_ONCE(rc == -ENOSPC);
> > +		if (rc == -EAGAIN) {
> >  			i++;
> >  			if (i >= 14 || (!server->noblocksnd && (i > 2))) {
> >  				cifs_dbg(VFS, "sends on sock %p stuck for 15 seconds\n",
> > 
> 
> Agreed. I have not seen any reports too. Looks good to me.
> 
> Acked-by: Suresh Jayaraman <sjayaraman-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org>
> 

I replaced the bogus Cc: line with your Acked-by: in my repo.

Thanks,
-- 
Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>