3 files changed, 25 insertions, 0 deletions

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 4ead72a001f9..ced0e42ce460 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -193,6 +193,8 @@ extern struct smb_vol *cifs_get_volume_info(char *mount_data,
 extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *);
 extern void cifs_umount(struct cifs_sb_info *);
 extern void cifs_mark_open_files_invalid(struct cifs_tcon *tcon);
+extern void cifs_reopen_persistent_handles(struct cifs_tcon *tcon);
+
 extern bool cifs_find_lock_conflict(struct cifsFileInfo *cfile, __u64 offset,
                                     __u64 length, __u8 type,
                                     struct cifsLockInfo **conf_lock,
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ee5ceae22411..8f27c8a74384 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -760,6 +760,24 @@ int cifs_close(struct inode *inode, struct file *file)
         return 0;
 }
 
+void
+cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
+{
+        struct cifsFileInfo *open_file = NULL;
+        struct list_head *tmp;
+        struct list_head *tmp1;
+
+        /* list all files open on tree connection, reopen resilient handles  */
+        spin_lock(&tcon->open_file_lock);
+        list_for_each_safe(tmp, tmp1, &tcon->openFileList) {
+                open_file = list_entry(tmp, struct cifsFileInfo, tlist);
+                spin_unlock(&tcon->open_file_lock);
+                cifs_reopen_file(open_file, false /* do not flush */);
+                spin_lock(&tcon->open_file_lock);
+        }
+        spin_unlock(&tcon->open_file_lock);
+}
+
 int cifs_closedir(struct inode *inode, struct file *file)
 {
         int rc = 0;
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 3eec96ca87d9..4d944c4c55a8 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -250,8 +250,13 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
         }
 
         cifs_mark_open_files_invalid(tcon);
+
         rc = SMB2_tcon(0, tcon->ses, tcon->treeName, tcon, nls_codepage);
         mutex_unlock(&tcon->ses->session_mutex);
+
+        if (tcon->use_persistent)
+                cifs_reopen_persistent_handles(tcon);
+
         cifs_dbg(FYI, "reconnect tcon rc = %d\n", rc);
         if (rc)
                 goto out;