From 8420490108ffd0a482d980be96954699f767672c Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 22 Mar 2013 08:36:45 -0400
Subject: [PATCH] --- yaml --- r: 373291 b: refs/heads/master c:
 ce6c44e44e43f0cef12030de0a8f0814914d47dd h: refs/heads/master i:   373289:
 5f4661b909f49b8458bc9590e6057dbfa845c365   373287:
 1c0f7ae38f6e34183c37e58c41f95260796b1a3f v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/transport.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0d90fbc3a2e8..5723cd3dfabe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f96637be081141d6f8813429499f164260b49d70
+refs/heads/master: ce6c44e44e43f0cef12030de0a8f0814914d47dd
diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c
index cf8bf69bd60c..653bf266428e 100644
--- a/trunk/fs/cifs/transport.c
+++ b/trunk/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",