removed sunrpc patch from 3.4 and 3.10

diff --git a/queue-3.10/series b/queue-3.10/series
index f2009afb75e74c3a0788536a285424b3f4eca5d7..f4a608c1f88e25ff54bc6472ab7396edb0215242 100644 (file)
--- 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 86c14a5af28401b3343188a637aa23b2ca5a6453..0f13cb20a6519da09eaba0001f9c5baefefeaadd 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 
 --- 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 <gregkh@linuxfoundation.org>
                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 <gregkh@linuxfoundation.org>
                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 (file)
index ba55986..0000000
--- 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 <skinsbursky@parallels.com>
-Date: Mon, 24 Jun 2013 11:52:59 +0400
-Subject: SUNRPC: PipeFS MOUNT notification optimization for dying clients
-
-From: Stanislav Kinsbursky <skinsbursky@parallels.com>
-
-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 <skinsbursky@parallels.com>
-Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 e4728ba9c7f434c9e223c3385b37c6ccd1ce8dae..490e5db261327e53f7d89fe798242ff658a9cc64 100644 (file)
--- 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 (file)
index 6866851..0000000
--- 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 <skinsbursky@parallels.com>
-Date: Mon, 24 Jun 2013 11:52:59 +0400
-Subject: SUNRPC: PipeFS MOUNT notification optimization for dying clients
-
-From: Stanislav Kinsbursky <skinsbursky@parallels.com>
-
-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 <skinsbursky@parallels.com>
-Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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;
- }
-