tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 8d4a0b5d 78e70952

+37 -21
+1 -1
fs/Kconfig
··· 367 367 source "fs/cifs/Kconfig" 368 368 source "fs/ksmbd/Kconfig" 369 369 370 - config CIFS_COMMON 370 + config SMBFS_COMMON 371 371 tristate 372 372 default y if CIFS=y 373 373 default m if CIFS=m
+1 -1
fs/Makefile
··· 96 96 obj-$(CONFIG_NLS) += nls/ 97 97 obj-$(CONFIG_UNICODE) += unicode/ 98 98 obj-$(CONFIG_SYSV_FS) += sysv/ 99 - obj-$(CONFIG_CIFS_COMMON) += cifs_common/ 99 + obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/ 100 100 obj-$(CONFIG_CIFS) += cifs/ 101 101 obj-$(CONFIG_SMB_SERVER) += ksmbd/ 102 102 obj-$(CONFIG_HPFS_FS) += hpfs/
+1 -1
fs/cifs/cifsencrypt.c
··· 22 22 #include <linux/random.h> 23 23 #include <linux/highmem.h> 24 24 #include <linux/fips.h> 25 - #include "../cifs_common/arc4.h" 25 + #include "../smbfs_common/arc4.h" 26 26 #include <crypto/aead.h> 27 27 28 28 int __cifs_calc_signature(struct smb_rqst *rqst,
+1 -1
fs/cifs/cifspdu.h
··· 12 12 13 13 #include <net/sock.h> 14 14 #include <asm/unaligned.h> 15 - #include "smbfsctl.h" 15 + #include "../smbfs_common/smbfsctl.h" 16 16 17 17 #define CIFS_PROT 0 18 18 #define POSIX_PROT (CIFS_PROT+1)
+13 -7
fs/cifs/smb2ops.c
··· 689 689 cifs_dbg(FYI, "clear cached root file handle\n"); 690 690 SMB2_close(0, cfid->tcon, cfid->fid->persistent_fid, 691 691 cfid->fid->volatile_fid); 692 - cfid->is_valid = false; 693 - cfid->file_all_info_is_valid = false; 694 - cfid->has_lease = false; 695 - if (cfid->dentry) { 696 - dput(cfid->dentry); 697 - cfid->dentry = NULL; 698 - } 692 + } 693 + 694 + /* 695 + * We only check validity above to send SMB2_close, 696 + * but we still need to invalidate these entries 697 + * when this function is called 698 + */ 699 + cfid->is_valid = false; 700 + cfid->file_all_info_is_valid = false; 701 + cfid->has_lease = false; 702 + if (cfid->dentry) { 703 + dput(cfid->dentry); 704 + cfid->dentry = NULL; 699 705 } 700 706 } 701 707
+1 -1
fs/cifs/smbencrypt.c
··· 24 24 #include "cifsglob.h" 25 25 #include "cifs_debug.h" 26 26 #include "cifsproto.h" 27 - #include "../cifs_common/md4.h" 27 + #include "../smbfs_common/md4.h" 28 28 29 29 #ifndef false 30 30 #define false 0
+13 -3
fs/cifs/smbfsctl.h fs/smbfs_common/smbfsctl.h
··· 1 - /* SPDX-License-Identifier: LGPL-2.1 */ 1 + /* SPDX-License-Identifier: LGPL-2.1+ */ 2 2 /* 3 3 * fs/cifs/smbfsctl.h: SMB, CIFS, SMB2 FSCTL definitions 4 4 * ··· 19 19 * could be invoked from tools via a specialized hook into the VFS rather 20 20 * than via the standard vfs entry points 21 21 * 22 - * See MS-SMB2 Section 2.2.31 (last checked June 2013, all of that list are 22 + * See MS-SMB2 Section 2.2.31 (last checked September 2021, all of that list are 23 23 * below). Additional detail on less common ones can be found in MS-FSCC 24 24 * section 2.3. 25 25 */ 26 + 27 + #ifndef __SMBFSCTL_H 28 + #define __SMBFSCTL_H 26 29 27 30 /* 28 31 * FSCTL values are 32 bits and are constructed as ··· 94 91 #define FSCTL_SET_ZERO_ON_DEALLOC 0x00090194 /* BB add struct */ 95 92 #define FSCTL_SET_SHORT_NAME_BEHAVIOR 0x000901B4 /* BB add struct */ 96 93 #define FSCTL_GET_INTEGRITY_INFORMATION 0x0009027C 94 + #define FSCTL_GET_REFS_VOLUME_DATA 0x000902D8 /* See MS-FSCC 2.3.24 */ 97 95 #define FSCTL_GET_RETRIEVAL_POINTERS_AND_REFCOUNT 0x000903d3 98 96 #define FSCTL_GET_RETRIEVAL_POINTER_COUNT 0x0009042b 99 97 #define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF ··· 150 146 #define IO_REPARSE_TAG_LX_CHR 0x80000025 151 147 #define IO_REPARSE_TAG_LX_BLK 0x80000026 152 148 149 + #define IO_REPARSE_TAG_LX_SYMLINK_LE cpu_to_le32(0xA000001D) 150 + #define IO_REPARSE_TAG_AF_UNIX_LE cpu_to_le32(0x80000023) 151 + #define IO_REPARSE_TAG_LX_FIFO_LE cpu_to_le32(0x80000024) 152 + #define IO_REPARSE_TAG_LX_CHR_LE cpu_to_le32(0x80000025) 153 + #define IO_REPARSE_TAG_LX_BLK_LE cpu_to_le32(0x80000026) 154 + 153 155 /* fsctl flags */ 154 156 /* If Flags is set to this value, the request is an FSCTL not ioctl request */ 155 157 #define SMB2_0_IOCTL_IS_FSCTL 0x00000001 156 - 158 + #endif /* __SMBFSCTL_H */
+2 -2
fs/cifs_common/Makefile fs/smbfs_common/Makefile
··· 3 3 # Makefile for Linux filesystem routines that are shared by client and server. 4 4 # 5 5 6 - obj-$(CONFIG_CIFS_COMMON) += cifs_arc4.o 7 - obj-$(CONFIG_CIFS_COMMON) += cifs_md4.o 6 + obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o 7 + obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o
fs/cifs_common/arc4.h fs/smbfs_common/arc4.h
+4 -4
fs/cifs_common/cifs_arc4.c fs/smbfs_common/cifs_arc4.c
··· 74 74 EXPORT_SYMBOL_GPL(cifs_arc4_crypt); 75 75 76 76 static int __init 77 - init_cifs_common(void) 77 + init_smbfs_common(void) 78 78 { 79 79 return 0; 80 80 } 81 81 static void __init 82 - exit_cifs_common(void) 82 + exit_smbfs_common(void) 83 83 { 84 84 } 85 85 86 - module_init(init_cifs_common) 87 - module_exit(exit_cifs_common) 86 + module_init(init_smbfs_common) 87 + module_exit(exit_smbfs_common)
fs/cifs_common/cifs_md4.c fs/smbfs_common/cifs_md4.c
fs/cifs_common/md4.h fs/smbfs_common/md4.h