From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2018 21:42:46 +0000 (-0700)
Subject: Merge tag '4.18-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~2359
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=325520142b47690018d09060a874327d5e7f0709;p=mirror_ubuntu-disco-kernel.git

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

Pull cifs updates from Steve French:

 - smb3 fixes for stable

 - addition of ftrace hooks for cifs.ko

 - improvements in compounding and smbdirect (rdma)

* tag '4.18-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: (38 commits)
  CIFS: Add support for direct pages in wdata
  CIFS: Use offset when reading pages
  CIFS: Add support for direct pages in rdata
  cifs: update multiplex loop to handle compounded responses
  cifs: remove header_preamble_size where it is always 0
  cifs: remove struct smb2_hdr
  CIFS: 511c54a2f69195b28afb9dd119f03787b1625bb4 adds a check for session expiry, status STATUS_NETWORK_SESSION_EXPIRED, however the server can also respond with STATUS_USER_SESSION_DELETED in cases where the session has been idle for some time and the server reaps the session to recover resources.
  cifs: change smb2_get_data_area_len to take a smb2_sync_hdr as argument
  cifs: update smb2_calc_size to use smb2_sync_hdr instead of smb2_hdr
  cifs: remove struct smb2_oplock_break_rsp
  cifs: remove rfc1002 header from all SMB2 response structures
  smb3: on reconnect set PreviousSessionId field
  smb3: Add posix create context for smb3.11 posix mounts
  smb3: add tracepoints for smb2/smb3 open
  cifs: add debug output to show nocase mount option
  smb3: add define for id for posix create context and corresponding struct
  cifs: update smb2_check_message to handle PDUs without a 4 byte length header
  smb3: allow "posix" mount option to enable new SMB311 protocol extensions
  smb3: add support for posix negotiate context
  cifs: allow disabling less secure legacy dialects
  ...
---

325520142b47690018d09060a874327d5e7f0709
diff --cc fs/cifs/cifs_debug.c
index 4bc4a7ac61d9,3985dc409bbd..116146022aa1
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@@ -485,36 -504,35 +492,36 @@@ cifs_proc_init(void
  	if (proc_fs_cifs == NULL)
  		return;
  
 -	proc_create("DebugData", 0, proc_fs_cifs, &cifs_debug_data_proc_fops);
 +	proc_create_single("DebugData", 0, proc_fs_cifs,
 +			cifs_debug_data_proc_show);
  
  #ifdef CONFIG_CIFS_STATS
- 	proc_create("Stats", 0, proc_fs_cifs, &cifs_stats_proc_fops);
+ 	proc_create("Stats", 0644, proc_fs_cifs, &cifs_stats_proc_fops);
  #endif /* STATS */
- 	proc_create("cifsFYI", 0, proc_fs_cifs, &cifsFYI_proc_fops);
- 	proc_create("traceSMB", 0, proc_fs_cifs, &traceSMB_proc_fops);
- 	proc_create("LinuxExtensionsEnabled", 0, proc_fs_cifs,
+ 	proc_create("cifsFYI", 0644, proc_fs_cifs, &cifsFYI_proc_fops);
+ 	proc_create("traceSMB", 0644, proc_fs_cifs, &traceSMB_proc_fops);
+ 	proc_create("LinuxExtensionsEnabled", 0644, proc_fs_cifs,
  		    &cifs_linux_ext_proc_fops);
- 	proc_create("SecurityFlags", 0, proc_fs_cifs,
+ 	proc_create("SecurityFlags", 0644, proc_fs_cifs,
  		    &cifs_security_flags_proc_fops);
- 	proc_create("LookupCacheEnabled", 0, proc_fs_cifs,
+ 	proc_create("LookupCacheEnabled", 0644, proc_fs_cifs,
  		    &cifs_lookup_cache_proc_fops);
  #ifdef CONFIG_CIFS_SMB_DIRECT
- 	proc_create("rdma_readwrite_threshold", 0, proc_fs_cifs,
+ 	proc_create("rdma_readwrite_threshold", 0644, proc_fs_cifs,
  		&cifs_rdma_readwrite_threshold_proc_fops);
- 	proc_create("smbd_max_frmr_depth", 0, proc_fs_cifs,
+ 	proc_create("smbd_max_frmr_depth", 0644, proc_fs_cifs,
  		&cifs_smbd_max_frmr_depth_proc_fops);
- 	proc_create("smbd_keep_alive_interval", 0, proc_fs_cifs,
+ 	proc_create("smbd_keep_alive_interval", 0644, proc_fs_cifs,
  		&cifs_smbd_keep_alive_interval_proc_fops);
- 	proc_create("smbd_max_receive_size", 0, proc_fs_cifs,
+ 	proc_create("smbd_max_receive_size", 0644, proc_fs_cifs,
  		&cifs_smbd_max_receive_size_proc_fops);
- 	proc_create("smbd_max_fragmented_recv_size", 0, proc_fs_cifs,
+ 	proc_create("smbd_max_fragmented_recv_size", 0644, proc_fs_cifs,
  		&cifs_smbd_max_fragmented_recv_size_proc_fops);
- 	proc_create("smbd_max_send_size", 0, proc_fs_cifs,
+ 	proc_create("smbd_max_send_size", 0644, proc_fs_cifs,
  		&cifs_smbd_max_send_size_proc_fops);
- 	proc_create("smbd_send_credit_target", 0, proc_fs_cifs,
+ 	proc_create("smbd_send_credit_target", 0644, proc_fs_cifs,
  		&cifs_smbd_send_credit_target_proc_fops);
- 	proc_create("smbd_receive_credit_max", 0, proc_fs_cifs,
+ 	proc_create("smbd_receive_credit_max", 0644, proc_fs_cifs,
  		&cifs_smbd_receive_credit_max_proc_fops);
  #endif
  }