Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce6c44e4 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: remove ENOSPC handling in smb_sendv 



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

Acked-by: default avatarSuresh Jayaraman <sjayaraman@novell.com>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent f96637be

fs/cifs/transport.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -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],

		rc = kernel_sendmsg(ssocket, &smb_msg, &iov[first_vec],

				    n_vec - first_vec, remaining);

				    n_vec - first_vec, remaining);

		if (rc == -ENOSPC || rc == -EAGAIN) {

		if (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);

			i++;

			i++;

			if (i >= 14 || (!server->noblocksnd && (i > 2))) {

			if (i >= 14 || (!server->noblocksnd && (i > 2))) {

				cifs_dbg(VFS, "sends on sock %p stuck for 15 seconds\n",

				cifs_dbg(VFS, "sends on sock %p stuck for 15 seconds\n",