Skip to content

Commit 94f2630

Browse files
committed
Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6
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
2 parents 6404674 + b581098 commit 94f2630

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/cifs/cifsfs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,5 @@ extern int cifs_truncate_page(struct address_space *mapping, loff_t from);
156156
extern const struct export_operations cifs_export_ops;
157157
#endif /* CONFIG_CIFS_NFSD_EXPORT */
158158

159-
#define CIFS_VERSION "2.24"
159+
#define CIFS_VERSION "2.25"
160160
#endif /* _CIFSFS_H */

fs/cifs/smb2pdu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
312312
if (server->tcpStatus != CifsNeedReconnect)
313313
break;
314314

315-
if (--retries)
315+
if (retries && --retries)
316316
continue;
317317

318318
/*

0 commit comments

Comments
 (0)