Commit 8a5203c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v7.0-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client updates from Steve French:

 - multichannel improvements, including making add channel async at
   mount time

 - fix potential double free in open path

 - retry fixes

 - locking improvements

 - fix potential directory lease races

 - cleanup patches for client headers

 - patches to better split out SMB1 code

 - minor cleanup of structs for gcc 14 warnings

 - error handling improvements

* tag 'v7.0-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6: (74 commits)
  cifs: Fix the copyright banner on smb1maperror.c
  smb: common: add header guards to fs/smb/common/smb2status.h
  smb: client: Avoid a dozen -Wflex-array-member-not-at-end warnings
  smb/client: remove useless comment in mapping_table_ERRSRV
  smb/client: remove some literal NT error codes from ntstatus_to_dos_map
  smb/client: add NT_STATUS_VOLUME_NOT_UPGRADED
  smb/client: add NT_STATUS_NO_USER_KEYS
  smb/client: add NT_STATUS_WRONG_EFS
  smb/client: add NT_STATUS_NO_EFS
  smb/client: add NT_STATUS_NO_RECOVERY_POLICY
  smb/client: add NT_STATUS_RANGE_NOT_FOUND
  smb/client: add NT_STATUS_DECRYPTION_FAILED
  smb/client: add NT_STATUS_ENCRYPTION_FAILED
  smb/client: add NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT
  smb/client: add NT_STATUS_VOLUME_DISMOUNTED
  smb/client: add NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT
  smb/client: add NT_STATUS_VARIABLE_NOT_FOUND
  smb/client: rename ERRinvlevel to ERRunknownlevel
  smb/client: add NT_STATUS_OS2_INVALID_LEVEL
  smb/client: map NT_STATUS_INVALID_INFO_CLASS to ERRbadpipe
  ...
parents af23fd93 95080648

fs/netfs/read_collect.c

+10 −0
Original line number Diff line number Diff line
@@ -546,6 +546,15 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq) 
		}

	}



	/* If need retry is set, error should not matter unless we hit too many

	 * retries. Pause the generation of new subreqs

	 */

	if (test_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags)) {

		trace_netfs_rreq(rreq, netfs_rreq_trace_set_pause);

		set_bit(NETFS_RREQ_PAUSE, &rreq->flags);

		goto skip_error_checks;

	}



	if (unlikely(subreq->error < 0)) {

		trace_netfs_failure(rreq, subreq, subreq->error, netfs_fail_read);

		if (subreq->source == NETFS_READ_FROM_CACHE) {
@@ -559,6 +568,7 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq) 
		set_bit(NETFS_RREQ_PAUSE, &rreq->flags);

	}



skip_error_checks:

	trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);

	netfs_subreq_clear_in_progress(subreq);

	netfs_put_subrequest(subreq, netfs_sreq_trace_put_terminated);

fs/netfs/read_retry.c

+2 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
static void netfs_reissue_read(struct netfs_io_request *rreq,

			       struct netfs_io_subrequest *subreq)

{

	subreq->error = 0;

	__clear_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);

	__set_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags);

	netfs_stat(&netfs_n_rh_retry_read_subreq);
@@ -242,8 +243,7 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq) 
	subreq = list_next_entry(subreq, rreq_link);

abandon:

	list_for_each_entry_from(subreq, &stream->subrequests, rreq_link) {

		if (!subreq->error &&

		    !test_bit(NETFS_SREQ_FAILED, &subreq->flags) &&

		if (!test_bit(NETFS_SREQ_FAILED, &subreq->flags) &&

		    !test_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags))

			continue;

		subreq->error = -ENOMEM;

fs/netfs/write_collect.c

+4 −4
Original line number Diff line number Diff line
@@ -492,11 +492,11 @@ void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error) 


	if (IS_ERR_VALUE(transferred_or_error)) {

		subreq->error = transferred_or_error;

		if (subreq->error == -EAGAIN)

			set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);

		else

		/* if need retry is set, error should not matter */

		if (!test_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags)) {

			set_bit(NETFS_SREQ_FAILED, &subreq->flags);

			trace_netfs_failure(wreq, subreq, transferred_or_error, netfs_fail_write);

		}



		switch (subreq->source) {

		case NETFS_WRITE_TO_CACHE:

fs/netfs/write_issue.c

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ void netfs_reissue_write(struct netfs_io_stream *stream, 
	iov_iter_truncate(&subreq->io_iter, size);



	subreq->retry_count++;

	subreq->error = 0;

	__clear_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);

	__set_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags);

	netfs_stat(&netfs_n_wh_retry_write_subreq);

fs/netfs/write_retry.c

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq, 
			subreq->start	= start;

			subreq->len	= len;

			__clear_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);

			subreq->retry_count++;

			trace_netfs_sreq(subreq, netfs_sreq_trace_retry);



			/* Renegotiate max_len (wsize) */