From 263e8559a48e5aaaa863e8b9ecdbcf366f7cac96 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Jul 2013 10:10:43 -0700 Subject: [PATCH] removed sunrpc patch from 3.4 and 3.10 --- queue-3.10/series | 1 - ...races-on-pipefs-umount-notifications.patch | 6 ++-- ...ation-optimization-for-dying-clients.patch | 33 ------------------- queue-3.4/series | 1 - ...ation-optimization-for-dying-clients.patch | 33 ------------------- 5 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 queue-3.10/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch delete mode 100644 queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch diff --git a/queue-3.10/series b/queue-3.10/series index f2009afb75e..f4a608c1f88 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -65,7 +65,6 @@ scsi-zfcp-status-read-buffers-on-first-adapter-open-with-link-down.patch scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch scsi-mpt2sas-fix-for-issue-missing-delay-not-getting-set-during-system-bootup.patch sunrpc-fix-races-on-pipefs-mount-notifications.patch -sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch sunrpc-fix-races-on-pipefs-umount-notifications.patch virtio_balloon-leak_balloon-only-tell-host-if-we-got-pages-deflated.patch b43-ensue-that-bcma-is-y-when-b43-is-y.patch diff --git a/queue-3.10/sunrpc-fix-races-on-pipefs-umount-notifications.patch b/queue-3.10/sunrpc-fix-races-on-pipefs-umount-notifications.patch index 86c14a5af28..0f13cb20a65 100644 --- a/queue-3.10/sunrpc-fix-races-on-pipefs-umount-notifications.patch +++ b/queue-3.10/sunrpc-fix-races-on-pipefs-umount-notifications.patch @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c -@@ -238,8 +238,6 @@ static struct rpc_clnt *rpc_get_client_f +@@ -236,8 +236,6 @@ static struct rpc_clnt *rpc_get_client_f continue; if (rpc_clnt_skip_event(clnt, event)) continue; @@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman spin_unlock(&sn->rpc_client_lock); return clnt; } -@@ -256,7 +254,6 @@ static int rpc_pipefs_event(struct notif +@@ -254,7 +252,6 @@ static int rpc_pipefs_event(struct notif while ((clnt = rpc_get_client_for_event(sb->s_fs_info, event))) { error = __rpc_pipefs_event(clnt, event, sb); @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman if (error) break; } -@@ -643,8 +640,8 @@ rpc_free_client(struct rpc_clnt *clnt) +@@ -641,8 +638,8 @@ rpc_free_client(struct rpc_clnt *clnt) rcu_dereference(clnt->cl_xprt)->servername); if (clnt->cl_parent != clnt) rpc_release_client(clnt->cl_parent); diff --git a/queue-3.10/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch b/queue-3.10/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch deleted file mode 100644 index ba55986156d..00000000000 --- a/queue-3.10/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4f6bb246f69443549fbbd0f2abaf863243cb35e9 Mon Sep 17 00:00:00 2001 -From: Stanislav Kinsbursky -Date: Mon, 24 Jun 2013 11:52:59 +0400 -Subject: SUNRPC: PipeFS MOUNT notification optimization for dying clients - -From: Stanislav Kinsbursky - -commit 4f6bb246f69443549fbbd0f2abaf863243cb35e9 upstream. - -Not need to create pipes for dying client. So just skip them. - -Note: we can safely dereference the client structure, because notification -caller is holding sn->pipefs_sb_lock. - -Signed-off-by: Stanislav Kinsbursky -Signed-off-by: Trond Myklebust -Signed-off-by: Greg Kroah-Hartman - ---- - net/sunrpc/clnt.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/sunrpc/clnt.c -+++ b/net/sunrpc/clnt.c -@@ -177,6 +177,8 @@ static inline int rpc_clnt_skip_event(st - if (((event == RPC_PIPEFS_MOUNT) && clnt->cl_dentry) || - ((event == RPC_PIPEFS_UMOUNT) && !clnt->cl_dentry)) - return 1; -+ if ((event == RPC_PIPEFS_MOUNT) && atomic_read(&clnt->cl_count) == 0) -+ return 1; - return 0; - } - diff --git a/queue-3.4/series b/queue-3.4/series index e4728ba9c7f..490e5db2613 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -8,5 +8,4 @@ ath9k-do-not-assign-noise-for-null-caldata.patch scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch tracing-use-current_uid-for-critical-time-tracing.patch -sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch iommu-amd-only-unmap-large-pages-from-the-first-pte.patch diff --git a/queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch b/queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch deleted file mode 100644 index 6866851fd19..00000000000 --- a/queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4f6bb246f69443549fbbd0f2abaf863243cb35e9 Mon Sep 17 00:00:00 2001 -From: Stanislav Kinsbursky -Date: Mon, 24 Jun 2013 11:52:59 +0400 -Subject: SUNRPC: PipeFS MOUNT notification optimization for dying clients - -From: Stanislav Kinsbursky - -commit 4f6bb246f69443549fbbd0f2abaf863243cb35e9 upstream. - -Not need to create pipes for dying client. So just skip them. - -Note: we can safely dereference the client structure, because notification -caller is holding sn->pipefs_sb_lock. - -Signed-off-by: Stanislav Kinsbursky -Signed-off-by: Trond Myklebust -Signed-off-by: Greg Kroah-Hartman - ---- - net/sunrpc/clnt.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/net/sunrpc/clnt.c -+++ b/net/sunrpc/clnt.c -@@ -181,6 +181,8 @@ static inline int rpc_clnt_skip_event(st - if (((event == RPC_PIPEFS_MOUNT) && clnt->cl_dentry) || - ((event == RPC_PIPEFS_UMOUNT) && !clnt->cl_dentry)) - return 1; -+ if ((event == RPC_PIPEFS_MOUNT) && atomic_read(&clnt->cl_count) == 0) -+ return 1; - return 0; - } - -- 2.47.3