Commit f2b24657 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.18-rc2-smb-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - add missing tracepoints

 - smbdirect (RDMA) fix

 - fix potential issue with credits underflow

 - rename fix

 - improvement to calc_signature and additional cleanup patch

* tag '6.18-rc2-smb-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: #include cifsglob.h before trace.h to allow structs in tracepoints
  cifs: Call the calc_signature functions directly
  smb: client: get rid of d_drop() in cifs_do_rename()
  cifs: Fix TCP_Server_Info::credits to be signed
  cifs: Add a couple of missing smb3_rw_credits tracepoints
  smb: client: allocate enough space for MR WRs and ib_drain_qp()
parents d2818517 64c9471a

fs/smb/client/cifsglob.h

+1 −3
Original line number Diff line number Diff line
@@ -534,8 +534,6 @@ struct smb_version_operations { 
	void (*new_lease_key)(struct cifs_fid *);

	int (*generate_signingkey)(struct cifs_ses *ses,

				   struct TCP_Server_Info *server);

	int (*calc_signature)(struct smb_rqst *, struct TCP_Server_Info *,

				bool allocate_crypto);

	int (*set_integrity)(const unsigned int, struct cifs_tcon *tcon,

			     struct cifsFileInfo *src_file);

	int (*enum_snapshots)(const unsigned int xid, struct cifs_tcon *tcon,
@@ -732,7 +730,7 @@ struct TCP_Server_Info { 
	bool nosharesock;

	bool tcp_nodelay;

	bool terminate;

	unsigned int credits;  /* send no more requests at once */

	int credits;  /* send no more requests at once */

	unsigned int max_credits; /* can override large 32000 default at mnt */

	unsigned int in_flight;  /* number of requests on the wire to server */

	unsigned int max_in_flight; /* max number of requests that were on wire */

fs/smb/client/cifsproto.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#define _CIFSPROTO_H

#include <linux/nls.h>

#include <linux/ctype.h>

#include "cifsglob.h"

#include "trace.h"

#ifdef CONFIG_CIFS_DFS_UPCALL

#include "dfs_cache.h"

fs/smb/client/cifssmb.c

+8 −0
Original line number Diff line number Diff line
@@ -1311,6 +1311,8 @@ cifs_readv_callback(struct mid_q_entry *mid) 
		.rreq_debug_id = rdata->rreq->debug_id,

		.rreq_debug_index = rdata->subreq.debug_index,

	};

	unsigned int rreq_debug_id = rdata->rreq->debug_id;

	unsigned int subreq_debug_index = rdata->subreq.debug_index;



	cifs_dbg(FYI, "%s: mid=%llu state=%d result=%d bytes=%zu\n",

		 __func__, mid->mid, mid->mid_state, rdata->result,
@@ -1374,6 +1376,9 @@ cifs_readv_callback(struct mid_q_entry *mid) 
			__set_bit(NETFS_SREQ_MADE_PROGRESS, &rdata->subreq.flags);

	}



	trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, rdata->credits.value,

			      server->credits, server->in_flight,

			      0, cifs_trace_rw_credits_read_response_clear);

	rdata->credits.value = 0;

	rdata->subreq.error = rdata->result;

	rdata->subreq.transferred += rdata->got_bytes;
@@ -1381,6 +1386,9 @@ cifs_readv_callback(struct mid_q_entry *mid) 
	netfs_read_subreq_terminated(&rdata->subreq);

	release_mid(mid);

	add_credits(server, &credits, 0);

	trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, 0,

			      server->credits, server->in_flight,

			      credits.value, cifs_trace_rw_credits_read_response_add);

}



/* cifs_async_readv - send an async write, and set up mid to handle result */

fs/smb/client/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -2484,11 +2484,8 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry, 
	}

#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */

do_rename_exit:

	if (rc == 0) {

	if (rc == 0)

		d_move(from_dentry, to_dentry);

		/* Force a new lookup */

		d_drop(from_dentry);

	}

	cifs_put_tlink(tlink);

	return rc;

}

fs/smb/client/smb2ops.c

+0 −4
Original line number Diff line number Diff line
@@ -5446,7 +5446,6 @@ struct smb_version_operations smb20_operations = { 
	.get_lease_key = smb2_get_lease_key,

	.set_lease_key = smb2_set_lease_key,

	.new_lease_key = smb2_new_lease_key,

	.calc_signature = smb2_calc_signature,

	.is_read_op = smb2_is_read_op,

	.set_oplock_level = smb2_set_oplock_level,

	.create_lease_buf = smb2_create_lease_buf,
@@ -5550,7 +5549,6 @@ struct smb_version_operations smb21_operations = { 
	.get_lease_key = smb2_get_lease_key,

	.set_lease_key = smb2_set_lease_key,

	.new_lease_key = smb2_new_lease_key,

	.calc_signature = smb2_calc_signature,

	.is_read_op = smb21_is_read_op,

	.set_oplock_level = smb21_set_oplock_level,

	.create_lease_buf = smb2_create_lease_buf,
@@ -5660,7 +5658,6 @@ struct smb_version_operations smb30_operations = { 
	.set_lease_key = smb2_set_lease_key,

	.new_lease_key = smb2_new_lease_key,

	.generate_signingkey = generate_smb30signingkey,

	.calc_signature = smb3_calc_signature,

	.set_integrity  = smb3_set_integrity,

	.is_read_op = smb21_is_read_op,

	.set_oplock_level = smb3_set_oplock_level,
@@ -5777,7 +5774,6 @@ struct smb_version_operations smb311_operations = { 
	.set_lease_key = smb2_set_lease_key,

	.new_lease_key = smb2_new_lease_key,

	.generate_signingkey = generate_smb311signingkey,

	.calc_signature = smb3_calc_signature,

	.set_integrity  = smb3_set_integrity,

	.is_read_op = smb21_is_read_op,

	.set_oplock_level = smb3_set_oplock_level,