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 '6.10-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull smb client fixes from Steve French:
"Two small smb3 fixes:

- Fix socket creation with sfu mount option (spotted by test generic/423)

- Minor cleanup: fix missing description in two files"

* tag '6.10-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: fix creating sockets when using sfu mount options
fs: smb: common: add missing MODULE_DESCRIPTION() macros

Linus Torvalds 89be4025 ec9eeb89

+10 -1
+1 -1
fs/smb/client/cifspdu.h
··· 2574 2574 2575 2575 2576 2576 struct win_dev { 2577 - unsigned char type[8]; /* IntxCHR or IntxBLK or LnxFIFO*/ 2577 + unsigned char type[8]; /* IntxCHR or IntxBLK or LnxFIFO or LnxSOCK */ 2578 2578 __le64 major; 2579 2579 __le64 minor; 2580 2580 } __attribute__((packed));
+4
fs/smb/client/inode.c
··· 606 606 mnr = le64_to_cpu(*(__le64 *)(pbuf+16)); 607 607 fattr->cf_rdev = MKDEV(mjr, mnr); 608 608 } 609 + } else if (memcmp("LnxSOCK", pbuf, 8) == 0) { 610 + cifs_dbg(FYI, "Socket\n"); 611 + fattr->cf_mode |= S_IFSOCK; 612 + fattr->cf_dtype = DT_SOCK; 609 613 } else if (memcmp("IntxLNK", pbuf, 7) == 0) { 610 614 cifs_dbg(FYI, "Symlink\n"); 611 615 fattr->cf_mode |= S_IFLNK;
+3
fs/smb/client/smb2ops.c
··· 4997 4997 pdev.major = cpu_to_le64(MAJOR(dev)); 4998 4998 pdev.minor = cpu_to_le64(MINOR(dev)); 4999 4999 break; 5000 + case S_IFSOCK: 5001 + strscpy(pdev.type, "LnxSOCK"); 5002 + break; 5000 5003 case S_IFIFO: 5001 5004 strscpy(pdev.type, "LnxFIFO"); 5002 5005 break;
+1
fs/smb/common/cifs_arc4.c
··· 10 10 #include <linux/module.h> 11 11 #include "arc4.h" 12 12 13 + MODULE_DESCRIPTION("ARC4 Cipher Algorithm"); 13 14 MODULE_LICENSE("GPL"); 14 15 15 16 int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
+1
fs/smb/common/cifs_md4.c
··· 24 24 #include <asm/byteorder.h> 25 25 #include "md4.h" 26 26 27 + MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)"); 27 28 MODULE_LICENSE("GPL"); 28 29 29 30 static inline u32 lshift(u32 x, unsigned int s)