diff options
Diffstat (limited to 'fs/cifs/misc.c')
| -rw-r--r-- | fs/cifs/misc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index de6073cccd9c..a7b492c213cd 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c | |||
| @@ -347,7 +347,7 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ , | |||
| 347 | if (current_fsuid() != treeCon->ses->linux_uid) { | 347 | if (current_fsuid() != treeCon->ses->linux_uid) { |
| 348 | cFYI(1, "Multiuser mode and UID " | 348 | cFYI(1, "Multiuser mode and UID " |
| 349 | "did not match tcon uid"); | 349 | "did not match tcon uid"); |
| 350 | read_lock(&cifs_tcp_ses_lock); | 350 | spin_lock(&cifs_tcp_ses_lock); |
| 351 | list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) { | 351 | list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) { |
| 352 | ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list); | 352 | ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list); |
| 353 | if (ses->linux_uid == current_fsuid()) { | 353 | if (ses->linux_uid == current_fsuid()) { |
| @@ -361,7 +361,7 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ , | |||
| 361 | } | 361 | } |
| 362 | } | 362 | } |
| 363 | } | 363 | } |
| 364 | read_unlock(&cifs_tcp_ses_lock); | 364 | spin_unlock(&cifs_tcp_ses_lock); |
| 365 | } | 365 | } |
| 366 | } | 366 | } |
| 367 | } | 367 | } |
| @@ -551,7 +551,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv) | |||
| 551 | return false; | 551 | return false; |
| 552 | 552 | ||
| 553 | /* look up tcon based on tid & uid */ | 553 | /* look up tcon based on tid & uid */ |
| 554 | read_lock(&cifs_tcp_ses_lock); | 554 | spin_lock(&cifs_tcp_ses_lock); |
| 555 | list_for_each(tmp, &srv->smb_ses_list) { | 555 | list_for_each(tmp, &srv->smb_ses_list) { |
| 556 | ses = list_entry(tmp, struct cifsSesInfo, smb_ses_list); | 556 | ses = list_entry(tmp, struct cifsSesInfo, smb_ses_list); |
| 557 | list_for_each(tmp1, &ses->tcon_list) { | 557 | list_for_each(tmp1, &ses->tcon_list) { |
| @@ -573,7 +573,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv) | |||
| 573 | */ | 573 | */ |
| 574 | if (netfile->closePend) { | 574 | if (netfile->closePend) { |
| 575 | spin_unlock(&cifs_file_list_lock); | 575 | spin_unlock(&cifs_file_list_lock); |
| 576 | read_unlock(&cifs_tcp_ses_lock); | 576 | spin_unlock(&cifs_tcp_ses_lock); |
| 577 | return true; | 577 | return true; |
| 578 | } | 578 | } |
| 579 | 579 | ||
| @@ -595,16 +595,16 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv) | |||
| 595 | netfile->oplock_break_cancelled = false; | 595 | netfile->oplock_break_cancelled = false; |
| 596 | 596 | ||
| 597 | spin_unlock(&cifs_file_list_lock); | 597 | spin_unlock(&cifs_file_list_lock); |
| 598 | read_unlock(&cifs_tcp_ses_lock); | 598 | spin_unlock(&cifs_tcp_ses_lock); |
| 599 | return true; | 599 | return true; |
| 600 | } | 600 | } |
| 601 | spin_unlock(&cifs_file_list_lock); | 601 | spin_unlock(&cifs_file_list_lock); |
| 602 | read_unlock(&cifs_tcp_ses_lock); | 602 | spin_unlock(&cifs_tcp_ses_lock); |
| 603 | cFYI(1, "No matching file for oplock break"); | 603 | cFYI(1, "No matching file for oplock break"); |
| 604 | return true; | 604 | return true; |
| 605 | } | 605 | } |
| 606 | } | 606 | } |
| 607 | read_unlock(&cifs_tcp_ses_lock); | 607 | spin_unlock(&cifs_tcp_ses_lock); |
| 608 | cFYI(1, "Can not process oplock break for non-existent connection"); | 608 | cFYI(1, "Can not process oplock break for non-existent connection"); |
| 609 | return true; | 609 | return true; |
| 610 | } | 610 | } |
