diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-15 21:16:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-15 21:16:30 -0400 |
| commit | 6b6cbc1471676402565e958674523d06213b82d7 (patch) | |
| tree | a66d41d276e5eb400e27641f24f34032fe1b9275 /fs/cifs/connect.c | |
| parent | ce07183282975026716107d36fd3f5f93de76668 (diff) | |
| parent | 1bf4b1268e66d9364fc6fd41f906bc01458530ac (diff) | |
| download | linux-6b6cbc1471676402565e958674523d06213b82d7.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 858698dcde3c..190a855bc844 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -905,10 +905,19 @@ cifs_demultiplex_thread(void *p) server->lstrp = jiffies; if (mid_entry != NULL) { + if ((mid_entry->mid_flags & MID_WAIT_CANCELLED) && + mid_entry->mid_state == MID_RESPONSE_RECEIVED && + server->ops->handle_cancelled_mid) + server->ops->handle_cancelled_mid( + mid_entry->resp_buf, + server); + if (!mid_entry->multiRsp || mid_entry->multiEnd) mid_entry->callback(mid_entry); - } else if (!server->ops->is_oplock_break || - !server->ops->is_oplock_break(buf, server)) { + } else if (server->ops->is_oplock_break && + server->ops->is_oplock_break(buf, server)) { + cifs_dbg(FYI, "Received oplock break\n"); + } else { cifs_dbg(VFS, "No task to wake, unknown frame received! NumMids %d\n", atomic_read(&midCount)); cifs_dump_mem("Received Data is: ", buf, @@ -3745,6 +3754,9 @@ try_mount_again: if (IS_ERR(tcon)) { rc = PTR_ERR(tcon); tcon = NULL; + if (rc == -EACCES) + goto mount_fail_check; + goto remote_path_check; } |