Commit 5a9ffb95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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/
parents 5d438e07 a4813799

fs/cifs/cifssmb.c

+1 −1
Original line number Diff line number Diff line
@@ -2152,8 +2152,8 @@ cifs_writev_requeue(struct cifs_writedata *wdata) 
			}

		}



		if (rc) {

		kref_put(&wdata2->refcount, cifs_writedata_release);

		if (rc) {

			if (is_retryable_error(rc))

				continue;

			i += nr_pages;

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -4060,7 +4060,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset) 
			 * than it negotiated since it will refuse the read

			 * then.

			 */

			if ((tcon->ses) && !(tcon->ses->capabilities &

			if (!(tcon->ses->capabilities &

				tcon->ses->server->vals->cap_large_files)) {

				current_read_size = min_t(uint,

					current_read_size, CIFSMaxBufSize);

fs/cifs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static __u64 simple_hashstr(const char *str) 
 * cifs_backup_query_path_info - SMB1 fallback code to get ino

 *

 * Fallback code to get file metadata when we don't have access to

 * @full_path (EACCESS) and have backup creds.

 * @full_path (EACCES) and have backup creds.

 *

 * @data will be set to search info result buffer

 * @resp_buf will be set to cifs resp buf and needs to be freed with

CRA Git | Maintained and supported by SUSTech CRA and CCSE