aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2011-01-11 07:24:23 -0500
committerSteve French <sfrench@us.ibm.com>2011-01-20 13:07:55 -0500
commit7749981ec31aa40e28a1ef5687e46bc1aa278fae (patch)
tree7c5f75916f55cfe5130e88534c48678155974adf /fs/cifs/cifssmb.c
parentfda3594362184383e73f0a2a5fa5b38ac0e04fd8 (diff)
cifs: remove code for setting timeouts on requests
Since we don't time out individual requests anymore, remove the code that we used to use for setting timeouts on different requests. Reviewed-by: Pavel Shilovsky <piastryyy@gmail.com> Reviewed-by: Suresh Jayaraman <sjayaraman@suse.de> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 54b9f5d8d1db..37113450757b 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1240,7 +1240,7 @@ OldOpenRetry:
1240 pSMB->ByteCount = cpu_to_le16(count); 1240 pSMB->ByteCount = cpu_to_le16(count);
1241 /* long_op set to 1 to allow for oplock break timeouts */ 1241 /* long_op set to 1 to allow for oplock break timeouts */
1242 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, 1242 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
1243 (struct smb_hdr *)pSMBr, &bytes_returned, CIFS_LONG_OP); 1243 (struct smb_hdr *)pSMBr, &bytes_returned, 0);
1244 cifs_stats_inc(&tcon->num_opens); 1244 cifs_stats_inc(&tcon->num_opens);
1245 if (rc) { 1245 if (rc) {
1246 cFYI(1, "Error in Open = %d", rc); 1246 cFYI(1, "Error in Open = %d", rc);
@@ -1353,7 +1353,7 @@ openRetry:
1353 pSMB->ByteCount = cpu_to_le16(count); 1353 pSMB->ByteCount = cpu_to_le16(count);
1354 /* long_op set to 1 to allow for oplock break timeouts */ 1354 /* long_op set to 1 to allow for oplock break timeouts */
1355 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, 1355 rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
1356 (struct smb_hdr *)pSMBr, &bytes_returned, CIFS_LONG_OP); 1356 (struct smb_hdr *)pSMBr, &bytes_returned, 0);
1357 cifs_stats_inc(&tcon->num_opens); 1357 cifs_stats_inc(&tcon->num_opens);
1358 if (rc) { 1358 if (rc) {
1359 cFYI(1, "Error in Open = %d", rc); 1359 cFYI(1, "Error in Open = %d", rc);
@@ -1435,7 +1435,7 @@ CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, const int netfid,
1435 iov[0].iov_base = (char *)pSMB; 1435 iov[0].iov_base = (char *)pSMB;
1436 iov[0].iov_len = pSMB->hdr.smb_buf_length + 4; 1436 iov[0].iov_len = pSMB->hdr.smb_buf_length + 4;
1437 rc = SendReceive2(xid, tcon->ses, iov, 1 /* num iovecs */, 1437 rc = SendReceive2(xid, tcon->ses, iov, 1 /* num iovecs */,
1438 &resp_buf_type, CIFS_STD_OP | CIFS_LOG_ERROR); 1438 &resp_buf_type, CIFS_LOG_ERROR);
1439 cifs_stats_inc(&tcon->num_reads); 1439 cifs_stats_inc(&tcon->num_reads);
1440 pSMBr = (READ_RSP *)iov[0].iov_base; 1440 pSMBr = (READ_RSP *)iov[0].iov_base;
1441 if (rc) { 1441 if (rc) {
@@ -3136,7 +3136,7 @@ CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,
3136 iov[0].iov_len = pSMB->hdr.smb_buf_length + 4; 3136 iov[0].iov_len = pSMB->hdr.smb_buf_length + 4;
3137 3137
3138 rc = SendReceive2(xid, tcon->ses, iov, 1 /* num iovec */, &buf_type, 3138 rc = SendReceive2(xid, tcon->ses, iov, 1 /* num iovec */, &buf_type,
3139 CIFS_STD_OP); 3139 0);
3140 cifs_stats_inc(&tcon->num_acl_get); 3140 cifs_stats_inc(&tcon->num_acl_get);
3141 if (rc) { 3141 if (rc) {
3142 cFYI(1, "Send error in QuerySecDesc = %d", rc); 3142 cFYI(1, "Send error in QuerySecDesc = %d", rc);