Merge tag '5.15-rc-cifs-part2' of git://git.samba.org/sfrench/cifs-2.6

Pull smbfs updates from Steve French:
 "cifs/smb3 updates:

   - DFS reconnect fix

   - begin creating common headers for server and client

   - rename the cifs_common directory to smbfs_common to be more
     consistent ie change use of the name cifs to smb (smb3 or smbfs is
     more accurate, as the very old cifs dialect has long been
     superseded by smb3 dialects).

  In the future we can rename the fs/cifs directory to fs/smbfs.

  This does not include the set of multichannel fixes nor the two
  deferred close fixes (they are still being reviewed and tested)"

* tag '5.15-rc-cifs-part2' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: properly invalidate cached root handle when closing it
  cifs: move SMB FSCTL definitions to common code
  cifs: rename cifs_common to smbfs_common
  cifs: update FSCTL definitions

diff --combined fs/Kconfig
index 47af46a,e794088..a6313a9
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -43,7 -43,7 +43,7 @@@ source "fs/f2fs/Kconfig
  source "fs/zonefs/Kconfig"
  
  config FS_DAX
 -      bool "Direct Access (DAX) support"
 +      bool "File system based Direct Access (DAX) support"
        depends on MMU
        depends on !(ARM || MIPS || SPARC)
        select DEV_PAGEMAP_OPS if (ZONE_DEVICE && !FS_DAX_LIMITED)
@@@ -53,23 -53,8 +53,23 @@@
          Direct Access (DAX) can be used on memory-backed block devices.
          If the block device supports DAX and the filesystem supports DAX,
          then you can avoid using the pagecache to buffer I/Os.  Turning
 -        on this option will compile in support for DAX; you will need to
 -        mount the filesystem using the -o dax option.
 +        on this option will compile in support for DAX.
 +
 +        For a DAX device to support file system access it needs to have
 +        struct pages.  For the nfit based NVDIMMs this can be enabled
 +        using the ndctl utility:
 +
 +              # ndctl create-namespace --force --reconfig=namespace0.0 \
 +                      --mode=fsdax --map=mem
 +
 +        See the 'create-namespace' man page for details on the overhead of
 +        --map=mem:
 +        https://docs.pmem.io/ndctl-user-guide/ndctl-man-pages/ndctl-create-namespace
 +
 +          For ndctl to work CONFIG_DEV_DAX needs to be enabled as well. For most
 +        file systems DAX support needs to be manually enabled globally or
 +        per-inode using a mount option as well.  See the file documentation in
 +        Documentation/filesystems/dax.rst for details.
  
          If you do not have a block device that is capable of using this,
          or if unsure, say N.  Saying Y will increase the size of the kernel
@@@ -151,7 -136,6 +151,7 @@@ menu "DOS/FAT/EXFAT/NT Filesystems
  source "fs/fat/Kconfig"
  source "fs/exfat/Kconfig"
  source "fs/ntfs/Kconfig"
 +source "fs/ntfs3/Kconfig"
  
  endmenu
  endif # BLOCK
@@@ -234,7 -218,8 +234,7 @@@ config ARCH_SUPPORTS_HUGETLBF
  
  config HUGETLBFS
        bool "HugeTLB file system support"
 -      depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
 -                 ARCH_SUPPORTS_HUGETLBFS || BROKEN
 +      depends on X86 || IA64 || SPARC64 || ARCH_SUPPORTS_HUGETLBFS || BROKEN
        help
          hugetlbfs is a filesystem backing for HugeTLB pages, based on
          ramfs. For architectures that support it, say Y here and read
@@@ -367,7 -352,7 +367,7 @@@ source "fs/ceph/Kconfig
  source "fs/cifs/Kconfig"
  source "fs/ksmbd/Kconfig"
  
- config CIFS_COMMON
+ config SMBFS_COMMON
        tristate
        default y if CIFS=y
        default m if CIFS=m

diff --combined fs/Makefile
index 9e712aa,1f18802..84c5e4c
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -17,7 -17,7 +17,7 @@@ obj-y :=      open.o read_write.o file_table
                kernel_read_file.o remap_range.o
  
  ifeq ($(CONFIG_BLOCK),y)
 -obj-y +=      buffer.o block_dev.o direct-io.o mpage.o
 +obj-y +=      buffer.o direct-io.o mpage.o
  else
  obj-y +=      no-block.o
  endif
@@@ -96,12 -96,11 +96,12 @@@ obj-$(CONFIG_LOCKD)                += lockd
  obj-$(CONFIG_NLS)             += nls/
  obj-$(CONFIG_UNICODE)         += unicode/
  obj-$(CONFIG_SYSV_FS)         += sysv/
- obj-$(CONFIG_CIFS_COMMON)     += cifs_common/
+ obj-$(CONFIG_SMBFS_COMMON)    += smbfs_common/
  obj-$(CONFIG_CIFS)            += cifs/
  obj-$(CONFIG_SMB_SERVER)      += ksmbd/
  obj-$(CONFIG_HPFS_FS)         += hpfs/
  obj-$(CONFIG_NTFS_FS)         += ntfs/
 +obj-$(CONFIG_NTFS3_FS)                += ntfs3/
  obj-$(CONFIG_UFS_FS)          += ufs/
  obj-$(CONFIG_EFS_FS)          += efs/
  obj-$(CONFIG_JFFS2_FS)                += jffs2/