Commit 8d4a0b5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 78e70952 9351590f

fs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -367,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

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 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/

fs/cifs/cifsencrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/random.h>

#include <linux/highmem.h>

#include <linux/fips.h>

#include "../cifs_common/arc4.h"

#include "../smbfs_common/arc4.h"

#include <crypto/aead.h>



int __cifs_calc_signature(struct smb_rqst *rqst,

fs/cifs/cifspdu.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <net/sock.h>

#include <asm/unaligned.h>

#include "smbfsctl.h"

#include "../smbfs_common/smbfsctl.h"



#define CIFS_PROT   0

#define POSIX_PROT  (CIFS_PROT+1)

fs/cifs/smb2ops.c

+13 −7
Original line number Diff line number Diff line
@@ -689,6 +689,13 @@ smb2_close_cached_fid(struct kref *ref) 
		cifs_dbg(FYI, "clear cached root file handle\n");

		SMB2_close(0, cfid->tcon, cfid->fid->persistent_fid,

			   cfid->fid->volatile_fid);

	}



	/*

	 * We only check validity above to send SMB2_close,

	 * but we still need to invalidate these entries

	 * when this function is called

	 */

	cfid->is_valid = false;

	cfid->file_all_info_is_valid = false;

	cfid->has_lease = false;
@@ -697,7 +704,6 @@ smb2_close_cached_fid(struct kref *ref) 
		cfid->dentry = NULL;

	}

}

}



void close_cached_dir(struct cached_fid *cfid)

{