Skip to content

Commit 5a9ffb9

Browse files
committed
Merge tag '5.7-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French: "Three small cifs/smb3 fixes, one for stable" * tag '5.7-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: cifs: fix leaked reference on requeued write cifs: Fix null pointer check in cifs_read CIFS: Spelling s/EACCESS/EACCES/
2 parents 5d438e0 + a481379 commit 5a9ffb9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/cifs/cifssmb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2152,8 +2152,8 @@ cifs_writev_requeue(struct cifs_writedata *wdata)
21522152
}
21532153
}
21542154

2155+
kref_put(&wdata2->refcount, cifs_writedata_release);
21552156
if (rc) {
2156-
kref_put(&wdata2->refcount, cifs_writedata_release);
21572157
if (is_retryable_error(rc))
21582158
continue;
21592159
i += nr_pages;

fs/cifs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4060,7 +4060,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset)
40604060
* than it negotiated since it will refuse the read
40614061
* then.
40624062
*/
4063-
if ((tcon->ses) && !(tcon->ses->capabilities &
4063+
if (!(tcon->ses->capabilities &
40644064
tcon->ses->server->vals->cap_large_files)) {
40654065
current_read_size = min_t(uint,
40664066
current_read_size, CIFSMaxBufSize);

fs/cifs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ static __u64 simple_hashstr(const char *str)
730730
* cifs_backup_query_path_info - SMB1 fallback code to get ino
731731
*
732732
* Fallback code to get file metadata when we don't have access to
733-
* @full_path (EACCESS) and have backup creds.
733+
* @full_path (EACCES) and have backup creds.
734734
*
735735
* @data will be set to search info result buffer
736736
* @resp_buf will be set to cifs resp buf and needs to be freed with

0 commit comments

Comments
 (0)