diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-15 10:52:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-15 10:52:25 -0400 |
| commit | eba84d958df2fd6c349ef69b6c9799ab4ee26613 (patch) | |
| tree | b6cfb5c886fe5d4a495d4998e1ad1b2feda80b0f | |
| parent | f72e14ecc9855b428f921130fe02708cc1d991f5 (diff) | |
| download | longterm-queue-4.8-eba84d958df2fd6c349ef69b6c9799ab4ee26613.tar.gz | |
cifs: drop reconnect patch n/a to 4.8.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/CIFS-reconnect-thread-reschedule-itself.patch | 52 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 53 deletions
diff --git a/queue/CIFS-reconnect-thread-reschedule-itself.patch b/queue/CIFS-reconnect-thread-reschedule-itself.patch deleted file mode 100644 index 34cc45e..0000000 --- a/queue/CIFS-reconnect-thread-reschedule-itself.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 18ea43113f5b74a97dd4be9bddbac10d68b1a6ce Mon Sep 17 00:00:00 2001 -From: Germano Percossi <germano.percossi@citrix.com> -Date: Fri, 7 Apr 2017 12:29:36 +0100 -Subject: [PATCH] CIFS: reconnect thread reschedule itself - -commit 18ea43113f5b74a97dd4be9bddbac10d68b1a6ce upstream. - -In case of error, smb2_reconnect_server reschedule itself -with a delay, to avoid being too aggressive. - -Signed-off-by: Germano Percossi <germano.percossi@citrix.com> -Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> -CC: Stable <stable@vger.kernel.org> -Signed-off-by: Steve French <smfrench@gmail.com> - -diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c -index 66fa1b941cdf..d09e98bb8584 100644 ---- a/fs/cifs/smb2pdu.c -+++ b/fs/cifs/smb2pdu.c -@@ -2181,6 +2181,9 @@ void smb2_reconnect_server(struct work_struct *work) - struct cifs_tcon *tcon, *tcon2; - struct list_head tmp_list; - int tcon_exist = false; -+ int rc; -+ int resched = false; -+ - - /* Prevent simultaneous reconnects that can corrupt tcon->rlist list */ - mutex_lock(&server->reconnect_mutex); -@@ -2208,13 +2211,18 @@ void smb2_reconnect_server(struct work_struct *work) - spin_unlock(&cifs_tcp_ses_lock); - - list_for_each_entry_safe(tcon, tcon2, &tmp_list, rlist) { -- if (!smb2_reconnect(SMB2_INTERNAL_CMD, tcon)) -+ rc = smb2_reconnect(SMB2_INTERNAL_CMD, tcon); -+ if (!rc) - cifs_reopen_persistent_handles(tcon); -+ else -+ resched = true; - list_del_init(&tcon->rlist); - cifs_put_tcon(tcon); - } - - cifs_dbg(FYI, "Reconnecting tcons finished\n"); -+ if (resched) -+ queue_delayed_work(cifsiod_wq, &server->reconnect, 2 * HZ); - mutex_unlock(&server->reconnect_mutex); - - /* now we can safely release srv struct */ --- -2.12.0 - diff --git a/queue/series b/queue/series index 10c2b73..0e664ea 100644 --- a/queue/series +++ b/queue/series @@ -150,7 +150,6 @@ thp-fix-MADV_DONTNEED-vs-clear-soft-dirty-race.patch zsmalloc-expand-class-bit.patch drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv.patch -CIFS-reconnect-thread-reschedule-itself.patch CIFS-store-results-of-cifs_reopen_file-to-avoid-infi.patch Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch perf-x86-Avoid-exposing-wrong-stale-data-in-intel_pm.patch |