Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6 (94f2630b) · Commits · 戴 / test

Pull cifs fix from Steve French: "Small SMB3 fix for stable (fixes problem with soft mounts)" * tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6: cifs: update internal module version number cifs: fix soft mounts hanging in the reconnect code

fs/cifs/cifsfs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,5 +156,5 @@ extern int cifs_truncate_page(struct address_space *mapping, loff_t from);
		extern const struct export_operations cifs_export_ops;
		#endif /* CONFIG_CIFS_NFSD_EXPORT */

		#define CIFS_VERSION "2.24"
		#define CIFS_VERSION "2.25"
		#endif /* _CIFSFS_H */

fs/cifs/smb2pdu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
		if (server->tcpStatus != CifsNeedReconnect)
		break;

		if (--retries)
		if (retries && --retries)
		continue;

		/*

Admin message