|
@@ -2188,7 +2188,7 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid)
|
|
|
if (rc)
|
|
|
goto free_pages;
|
|
|
|
|
|
- rc = cifs_discard_remaining_data(server);
|
|
|
+ rc = cifs_discard_remaining_data(server, buf);
|
|
|
if (rc)
|
|
|
goto free_pages;
|
|
|
|
|
@@ -2214,7 +2214,7 @@ free_pages:
|
|
|
kfree(pages);
|
|
|
return rc;
|
|
|
discard_data:
|
|
|
- cifs_discard_remaining_data(server);
|
|
|
+ cifs_discard_remaining_data(server, buf);
|
|
|
goto free_pages;
|
|
|
}
|
|
|
|
|
@@ -2322,6 +2322,7 @@ struct smb_version_operations smb20_operations = {
|
|
|
.clear_stats = smb2_clear_stats,
|
|
|
.print_stats = smb2_print_stats,
|
|
|
.is_oplock_break = smb2_is_valid_oplock_break,
|
|
|
+ .handle_cancelled_mid = smb2_handle_cancelled_mid,
|
|
|
.downgrade_oplock = smb2_downgrade_oplock,
|
|
|
.need_neg = smb2_need_neg,
|
|
|
.negotiate = smb2_negotiate,
|
|
@@ -2404,6 +2405,7 @@ struct smb_version_operations smb21_operations = {
|
|
|
.clear_stats = smb2_clear_stats,
|
|
|
.print_stats = smb2_print_stats,
|
|
|
.is_oplock_break = smb2_is_valid_oplock_break,
|
|
|
+ .handle_cancelled_mid = smb2_handle_cancelled_mid,
|
|
|
.downgrade_oplock = smb2_downgrade_oplock,
|
|
|
.need_neg = smb2_need_neg,
|
|
|
.negotiate = smb2_negotiate,
|
|
@@ -2488,6 +2490,7 @@ struct smb_version_operations smb30_operations = {
|
|
|
.print_stats = smb2_print_stats,
|
|
|
.dump_share_caps = smb2_dump_share_caps,
|
|
|
.is_oplock_break = smb2_is_valid_oplock_break,
|
|
|
+ .handle_cancelled_mid = smb2_handle_cancelled_mid,
|
|
|
.downgrade_oplock = smb2_downgrade_oplock,
|
|
|
.need_neg = smb2_need_neg,
|
|
|
.negotiate = smb2_negotiate,
|
|
@@ -2582,6 +2585,7 @@ struct smb_version_operations smb311_operations = {
|
|
|
.print_stats = smb2_print_stats,
|
|
|
.dump_share_caps = smb2_dump_share_caps,
|
|
|
.is_oplock_break = smb2_is_valid_oplock_break,
|
|
|
+ .handle_cancelled_mid = smb2_handle_cancelled_mid,
|
|
|
.downgrade_oplock = smb2_downgrade_oplock,
|
|
|
.need_neg = smb2_need_neg,
|
|
|
.negotiate = smb2_negotiate,
|