Skip to contentSkip to conversation

cifs: remove ENOSPC handling in smb_sendv

PATCH In review Jeff Layton 2 participants 3 messages Mar 22, 2013 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: remove ENOSPC handling in smb_sendv

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

Suresh Jayaraman <[email protected]>

---
 fs/cifs/transport.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
fs/cifs/transport.c +1 -7
index cf8bf69..653bf26 100644
@@ -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",
Signature · 1 line
1.7.11.7

A message that is not in the archive (sent off-list or not yet received): 1363956226-10179-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#2 lore raw
Quoted 4 lines · Jeff Layton

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

Suresh Jayaraman <[email protected]>

Seemed to have missed Cc Tag.

Quoted 15 lines
---
 fs/cifs/transport.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
fs/cifs/transport.c +0 -1
index cf8bf69..653bf26 100644
@@ -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) {

fs/cifs/transport.c smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec, · line 185

Quoted 10 lines
fs/cifs/transport.c +1 -6
-			/*
-			 * 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.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 8 lines · On Fri, 22 Mar 2013 19:30:09 +0530 Suresh Jayaraman…
Quoted 4 lines · Jeff Layton

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

Suresh Jayaraman <[email protected]>

Seemed to have missed Cc Tag.

Doh!

Quoted 28 lines
Quoted 15 lines
---
 fs/cifs/transport.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
fs/cifs/transport.c +0 -1
index cf8bf69..653bf26 100644
@@ -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) {

fs/cifs/transport.c smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec, · line 185

Quoted 10 lines
fs/cifs/transport.c +1 -6
-			/*
-			 * 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.

Quoted 2 lines

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

Thanks,

Signature · 1 line
Jeff Layton <[email protected]>