diff options
-rw-r--r-- | fs/cifs/CHANGES | 3 | ||||
-rw-r--r-- | fs/cifs/connect.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 13d788f9e5f0..0c778765bd79 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
@@ -3,7 +3,8 @@ Version 1.52 | |||
3 | Fix oops on second mount to server when null auth is used. | 3 | Fix oops on second mount to server when null auth is used. |
4 | Enable experimental Kerberos support. Return writebehind errors on flush | 4 | Enable experimental Kerberos support. Return writebehind errors on flush |
5 | and sync so that events like out of disk space get reported properly on | 5 | and sync so that events like out of disk space get reported properly on |
6 | cached files. Fix setxattr failure to certain Samba versions. | 6 | cached files. Fix setxattr failure to certain Samba versions. Fix mount |
7 | of second share to disconnected server session (autoreconnect on this). | ||
7 | 8 | ||
8 | Version 1.51 | 9 | Version 1.51 |
9 | ------------ | 10 | ------------ |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index fd9147cdb5a9..658f58b99e6f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -1964,7 +1964,15 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
1964 | 1964 | ||
1965 | if (existingCifsSes) { | 1965 | if (existingCifsSes) { |
1966 | pSesInfo = existingCifsSes; | 1966 | pSesInfo = existingCifsSes; |
1967 | cFYI(1, ("Existing smb sess found")); | 1967 | cFYI(1, ("Existing smb sess found (status=%d)", |
1968 | pSesInfo->status)); | ||
1969 | if (pSesInfo->status == CifsNeedReconnect) { | ||
1970 | cFYI(1, ("Session needs reconnect")); | ||
1971 | down(&pSesInfo->sesSem); | ||
1972 | rc = cifs_setup_session(xid, pSesInfo, | ||
1973 | cifs_sb->local_nls); | ||
1974 | up(&pSesInfo->sesSem); | ||
1975 | } | ||
1968 | } else if (!rc) { | 1976 | } else if (!rc) { |
1969 | cFYI(1, ("Existing smb sess not found")); | 1977 | cFYI(1, ("Existing smb sess not found")); |
1970 | pSesInfo = sesInfoAlloc(); | 1978 | pSesInfo = sesInfoAlloc(); |