Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 89be402

Browse files
committed
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
2 parents ec9eeb8 + 518549c commit 89be402

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed

fs/smb/client/cifspdu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2574,7 +2574,7 @@ typedef struct {
25742574

25752575

25762576
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 */
25782578
__le64 major;
25792579
__le64 minor;
25802580
} __attribute__((packed));

fs/smb/client/inode.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,10 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
606606
mnr = le64_to_cpu(*(__le64 *)(pbuf+16));
607607
fattr->cf_rdev = MKDEV(mjr, mnr);
608608
}
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;
609613
} else if (memcmp("IntxLNK", pbuf, 7) == 0) {
610614
cifs_dbg(FYI, "Symlink\n");
611615
fattr->cf_mode |= S_IFLNK;

fs/smb/client/smb2ops.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4997,6 +4997,9 @@ static int __cifs_sfu_make_node(unsigned int xid, struct inode *inode,
49974997
pdev.major = cpu_to_le64(MAJOR(dev));
49984998
pdev.minor = cpu_to_le64(MINOR(dev));
49994999
break;
5000+
case S_IFSOCK:
5001+
strscpy(pdev.type, "LnxSOCK");
5002+
break;
50005003
case S_IFIFO:
50015004
strscpy(pdev.type, "LnxFIFO");
50025005
break;

fs/smb/common/cifs_arc4.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/module.h>
1111
#include "arc4.h"
1212

13+
MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
1314
MODULE_LICENSE("GPL");
1415

1516
int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)

fs/smb/common/cifs_md4.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <asm/byteorder.h>
2525
#include "md4.h"
2626

27+
MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
2728
MODULE_LICENSE("GPL");
2829

2930
static inline u32 lshift(u32 x, unsigned int s)

0 commit comments

Comments
 (0)