Commit 0d85b27b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull smb directory moves and client fixes from Steve French:
 "Four smb3 client fixes (three of which marked for stable) and three
  patches to move of fs/cifs and fs/ksmbd to a new common "fs/smb"
  parent directory

   - Move the client and server source directories to a common parent
     directory:

       fs/cifs -> fs/smb/client
       fs/ksmbd -> fs/smb/server
       fs/smbfs_common -> fs/smb/common

   - important readahead fix

   - important fix for SMB1 regression

   - fix for missing mount option ("mapchars") in mount API conversion

   - minor debugging improvement"

* tag '6.4-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: move Documentation/filesystems/cifs to Documentation/filesystems/smb
  cifs: correct references in Documentation to old fs/cifs path
  smb: move client and server files to common directory fs/smb
  cifs: mapchars mount option ignored
  smb3: display debug information better for encryption
  cifs: fix smb1 mount regression
  cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size
parents 192fe71c ab6cacf8

Documentation/admin-guide/cifs/changes.rst

+2 −2
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ Changes 
See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary

information about fixes/improvements to CIFS/SMB2/SMB3 support (changes

to cifs.ko module) by kernel version (and cifs internal module version).

This may be easier to read than parsing the output of "git log fs/cifs"

by release.
 
This may be easier to read than parsing the output of

"git log fs/smb/client" by release.

Documentation/admin-guide/cifs/usage.rst

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Installation instructions 


If you have built the CIFS vfs as module (successfully) simply

type ``make modules_install`` (or if you prefer, manually copy the file to

the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko).

the modules directory e.g. /lib/modules/6.3.0-060300-generic/kernel/fs/smb/client/cifs.ko).



If you have built the CIFS vfs into the kernel itself, follow the instructions

for your distribution on how to install a new kernel (usually you
@@ -66,15 +66,15 @@ If cifs is built as a module, then the size and number of network buffers 
and maximum number of simultaneous requests to one server can be configured.

Changing these from their defaults is not recommended. By executing modinfo::



	modinfo kernel/fs/cifs/cifs.ko

	modinfo <path to cifs.ko>



on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made

on kernel/fs/smb/client/cifs.ko the list of configuration changes that can be made

at module initialization time (by running insmod cifs.ko) can be seen.



Recommendations

===============



To improve security the SMB2.1 dialect or later (usually will get SMB3) is now

To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is now

the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"

on mount (or vers=2.0 for Windows Vista).  Note that the CIFS (vers=1.0) is

much older and less secure than the default dialect SMB3 which includes

Documentation/filesystems/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ Documentation for filesystem implementations. 
   befs

   bfs

   btrfs

   cifs/index

   ceph

   coda

   configfs
@@ -111,6 +110,7 @@ Documentation for filesystem implementations. 
   ramfs-rootfs-initramfs

   relay

   romfs

   smb/index

   spufs/index

   squashfs

   sysfs

Documentation/filesystems/cifs/cifsroot.rst→Documentation/filesystems/smb/cifsroot.rst

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ the root file system via SMB protocol. 
Enables the kernel to mount the root file system via SMB that are

located in the <server-ip> and <share> specified in this option.



The default mount options are set in fs/cifs/cifsroot.c.

The default mount options are set in fs/smb/client/cifsroot.c.



server-ip

	IPv4 address of the server.