diff options
Diffstat (limited to 'fs/cifs/transport.c')
-rw-r--r-- | fs/cifs/transport.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index f9ebe70ecc4d..746bc9405db1 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "cifsglob.h" | 32 | #include "cifsglob.h" |
33 | #include "cifsproto.h" | 33 | #include "cifsproto.h" |
34 | #include "cifs_debug.h" | 34 | #include "cifs_debug.h" |
35 | 35 | ||
36 | extern mempool_t *cifs_mid_poolp; | 36 | extern mempool_t *cifs_mid_poolp; |
37 | extern struct kmem_cache *cifs_oplock_cachep; | 37 | extern struct kmem_cache *cifs_oplock_cachep; |
38 | 38 | ||
@@ -49,7 +49,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses) | |||
49 | cERROR(1, ("Null TCP session in AllocMidQEntry")); | 49 | cERROR(1, ("Null TCP session in AllocMidQEntry")); |
50 | return NULL; | 50 | return NULL; |
51 | } | 51 | } |
52 | 52 | ||
53 | temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp, | 53 | temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp, |
54 | GFP_KERNEL | GFP_NOFS); | 54 | GFP_KERNEL | GFP_NOFS); |
55 | if (temp == NULL) | 55 | if (temp == NULL) |
@@ -223,7 +223,7 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec, | |||
223 | unsigned int total_len; | 223 | unsigned int total_len; |
224 | int first_vec = 0; | 224 | int first_vec = 0; |
225 | unsigned int smb_buf_length = smb_buffer->smb_buf_length; | 225 | unsigned int smb_buf_length = smb_buffer->smb_buf_length; |
226 | 226 | ||
227 | if (ssocket == NULL) | 227 | if (ssocket == NULL) |
228 | return -ENOTSOCK; /* BB eventually add reconnect code here */ | 228 | return -ENOTSOCK; /* BB eventually add reconnect code here */ |
229 | 229 | ||
@@ -335,7 +335,7 @@ static int wait_for_free_request(struct cifsSesInfo *ses, const int long_op) | |||
335 | 335 | ||
336 | /* can not count locking commands against total | 336 | /* can not count locking commands against total |
337 | as they are allowed to block on server */ | 337 | as they are allowed to block on server */ |
338 | 338 | ||
339 | /* update # of requests on the wire to server */ | 339 | /* update # of requests on the wire to server */ |
340 | if (long_op < 3) | 340 | if (long_op < 3) |
341 | atomic_inc(&ses->server->inFlight); | 341 | atomic_inc(&ses->server->inFlight); |
@@ -426,7 +426,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
426 | unsigned long timeout; | 426 | unsigned long timeout; |
427 | struct mid_q_entry *midQ; | 427 | struct mid_q_entry *midQ; |
428 | struct smb_hdr *in_buf = iov[0].iov_base; | 428 | struct smb_hdr *in_buf = iov[0].iov_base; |
429 | 429 | ||
430 | *pRespBufType = CIFS_NO_BUFFER; /* no response buf yet */ | 430 | *pRespBufType = CIFS_NO_BUFFER; /* no response buf yet */ |
431 | 431 | ||
432 | if ((ses == NULL) || (ses->server == NULL)) { | 432 | if ((ses == NULL) || (ses->server == NULL)) { |
@@ -537,7 +537,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
537 | wake_up(&ses->server->request_q); | 537 | wake_up(&ses->server->request_q); |
538 | return rc; | 538 | return rc; |
539 | } | 539 | } |
540 | 540 | ||
541 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { | 541 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { |
542 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", | 542 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", |
543 | receive_len, xid)); | 543 | receive_len, xid)); |
@@ -718,7 +718,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
718 | wake_up(&ses->server->request_q); | 718 | wake_up(&ses->server->request_q); |
719 | return rc; | 719 | return rc; |
720 | } | 720 | } |
721 | 721 | ||
722 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { | 722 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { |
723 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", | 723 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", |
724 | receive_len, xid)); | 724 | receive_len, xid)); |
@@ -962,7 +962,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon, | |||
962 | DeleteMidQEntry(midQ); | 962 | DeleteMidQEntry(midQ); |
963 | return rc; | 963 | return rc; |
964 | } | 964 | } |
965 | 965 | ||
966 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { | 966 | if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { |
967 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", | 967 | cERROR(1, ("Frame too large received. Length: %d Xid: %d", |
968 | receive_len, xid)); | 968 | receive_len, xid)); |