summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2013-03-22 08:36:45 -0400
committerSteve French <smfrench@gmail.com>2013-05-04 22:17:51 -0500
commitce6c44e44e43f0cef12030de0a8f0814914d47dd (patch)
treec76f529e77d09739b2ffa4b15d725a819c47d79e /fs
parentf96637be081141d6f8813429499f164260b49d70 (diff)
downloadlinux-3.10-ce6c44e44e43f0cef12030de0a8f0814914d47dd.tar.gz
linux-3.10-ce6c44e44e43f0cef12030de0a8f0814914d47dd.tar.bz2
linux-3.10-ce6c44e44e43f0cef12030de0a8f0814914d47dd.zip
cifs: remove ENOSPC handling in smb_sendv
To my knowledge, no one ever reported seeing this pop. Acked-by: Suresh Jayaraman <sjayaraman@novell.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/transport.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index cf8bf69bd60..653bf266428 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",