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

Merge tag '5.1-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb3 updates from Steve French:

 - smb3/cifs fixes including for large i/o error cases

 - fixes for three xfstests

 - improved crediting (smb3 flow control)

 - improved tracing

* tag '5.1-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: (44 commits)
  fs: cifs: Kconfig: pedantic formatting
  smb3: request more credits on normal (non-large read/write) ops
  CIFS: Mask off signals when sending SMB packets
  CIFS: Return -EAGAIN instead of -ENOTSOCK
  CIFS: Only send SMB2_NEGOTIATE command on new TCP connections
  CIFS: Fix read after write for files with read caching
  smb3: for kerberos mounts display the credential uid used
  cifs: use correct format characters
  smb3: add dynamic trace point for query_info_enter/done
  smb3: add dynamic trace point for smb3_cmd_enter
  smb3: improve dynamic tracing of open and posix mkdir
  smb3: add missing read completion trace point
  smb3: Add tracepoints for read, write and query_dir enter
  smb3: add tracepoints for query dir
  smb3: Update POSIX negotiate context with POSIX ctxt GUID
  cifs: update internal module version number
  CIFS: Try to acquire credits at once for compound requests
  CIFS: Return error code when getting file handle for writeback
  CIFS: Move open file handling to writepages
  CIFS: Move unlocking pages from wdata_send_pages()
  ...
parents d1cae948 50cfad78

fs/cifs/Kconfig

+60 −60
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ config CIFS_DEBUG 
	  Enabling this option adds helpful debugging messages to

	  the cifs code which increases the size of the cifs module.

	  If unsure, say Y.



config CIFS_DEBUG2

	bool "Enable additional CIFS debugging routines"

	depends on CIFS_DEBUG
@@ -215,4 +216,3 @@ config CIFS_FSCACHE 
	  Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data

	  to be cached locally on disk through the general filesystem cache

	  manager. If unsure, say N.

fs/cifs/cifs_dfs_ref.c

+2 −2
Original line number Diff line number Diff line
@@ -285,9 +285,9 @@ static void dump_referral(const struct dfs_info3_param *ref) 
{

	cifs_dbg(FYI, "DFS: ref path: %s\n", ref->path_name);

	cifs_dbg(FYI, "DFS: node path: %s\n", ref->node_name);

	cifs_dbg(FYI, "DFS: fl: %hd, srv_type: %hd\n",

	cifs_dbg(FYI, "DFS: fl: %d, srv_type: %d\n",

		 ref->flags, ref->server_type);

	cifs_dbg(FYI, "DFS: ref_flags: %hd, path_consumed: %hd\n",

	cifs_dbg(FYI, "DFS: ref_flags: %d, path_consumed: %d\n",

		 ref->ref_flag, ref->path_consumed);

}

fs/cifs/cifs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct cifs_sb_info { 
	spinlock_t tlink_tree_lock;

	struct tcon_link *master_tlink;

	struct nls_table *local_nls;

	unsigned int bsize;

	unsigned int rsize;

	unsigned int wsize;

	unsigned long actimeo; /* attribute cache timeout (jiffies) */

fs/cifs/cifsfs.c

+2 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ cifs_show_security(struct seq_file *s, struct cifs_ses *ses) 
		seq_puts(s, "ntlm");

		break;

	case Kerberos:

		seq_puts(s, "krb5");

		seq_printf(s, "krb5,cruid=%u", from_kuid_munged(&init_user_ns,ses->cred_uid));

		break;

	case RawNTLMSSP:

		seq_puts(s, "ntlmssp");
@@ -554,6 +554,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 


	seq_printf(s, ",rsize=%u", cifs_sb->rsize);

	seq_printf(s, ",wsize=%u", cifs_sb->wsize);

	seq_printf(s, ",bsize=%u", cifs_sb->bsize);

	seq_printf(s, ",echo_interval=%lu",

			tcon->ses->server->echo_interval / HZ);

	if (tcon->snapshot_time)

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -150,5 +150,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.17"

#define CIFS_VERSION   "2.18"

#endif				/* _CIFSFS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE