---

yaml --- r: 373291 b: refs/heads/master c: ce6c44e h: refs/heads/master i: 373289: 5f4661b 373287: 1c0f7ae v: v3
git-mirror · May 5, 2013 · 8420490 · 8420490
1 parent bc02722
commit 8420490
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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",