mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08:00
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
This commit is contained in:
@@ -2574,7 +2574,7 @@ typedef struct {
|
||||
|
||||
|
||||
struct win_dev {
|
||||
unsigned char type[8]; /* IntxCHR or IntxBLK or LnxFIFO*/
|
||||
unsigned char type[8]; /* IntxCHR or IntxBLK or LnxFIFO or LnxSOCK */
|
||||
__le64 major;
|
||||
__le64 minor;
|
||||
} __attribute__((packed));
|
||||
|
||||
@@ -606,6 +606,10 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
|
||||
mnr = le64_to_cpu(*(__le64 *)(pbuf+16));
|
||||
fattr->cf_rdev = MKDEV(mjr, mnr);
|
||||
}
|
||||
} else if (memcmp("LnxSOCK", pbuf, 8) == 0) {
|
||||
cifs_dbg(FYI, "Socket\n");
|
||||
fattr->cf_mode |= S_IFSOCK;
|
||||
fattr->cf_dtype = DT_SOCK;
|
||||
} else if (memcmp("IntxLNK", pbuf, 7) == 0) {
|
||||
cifs_dbg(FYI, "Symlink\n");
|
||||
fattr->cf_mode |= S_IFLNK;
|
||||
|
||||
@@ -4997,6 +4997,9 @@ static int __cifs_sfu_make_node(unsigned int xid, struct inode *inode,
|
||||
pdev.major = cpu_to_le64(MAJOR(dev));
|
||||
pdev.minor = cpu_to_le64(MINOR(dev));
|
||||
break;
|
||||
case S_IFSOCK:
|
||||
strscpy(pdev.type, "LnxSOCK");
|
||||
break;
|
||||
case S_IFIFO:
|
||||
strscpy(pdev.type, "LnxFIFO");
|
||||
break;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <linux/module.h>
|
||||
#include "arc4.h"
|
||||
|
||||
MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <asm/byteorder.h>
|
||||
#include "md4.h"
|
||||
|
||||
MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static inline u32 lshift(u32 x, unsigned int s)
|
||||
|
||||
Reference in New Issue
Block a user