deleted queue-3.0/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegatio...

diff --git a/queue-3.0/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch b/queue-3.0/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch
deleted file mode 100644 (file)
index 29098ca..0000000
--- a/queue-3.0/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dbb21c25a35a71baf413f5176f028ee11b88cfbc Mon Sep 17 00:00:00 2001
-From: Trond Myklebust <Trond.Myklebust@netapp.com>
-Date: Mon, 1 Apr 2013 14:27:29 -0400
-Subject: NFSv4: Handle NFS4ERR_DELAY and NFS4ERR_GRACE in nfs4_lock_delegation_recall
-
-From: Trond Myklebust <Trond.Myklebust@netapp.com>
-
-commit dbb21c25a35a71baf413f5176f028ee11b88cfbc upstream.
-
-A server shouldn't normally return NFS4ERR_GRACE if the client holds a
-delegation, since no conflicting lock reclaims can be granted, however
-the spec does not require the server to grant the lock in this
-instance.
-
-Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/nfs/nfs4proc.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/fs/nfs/nfs4proc.c
-+++ b/fs/nfs/nfs4proc.c
-@@ -4658,6 +4658,12 @@ int nfs4_lock_delegation_recall(struct n
-                                */
-                               err = 0;
-                               goto out;
-+                      case -NFS4ERR_DELAY:
-+                      case -NFS4ERR_GRACE:
-+                              set_bit(NFS_DELEGATED_STATE, &state->flags);
-+                              ssleep(1);
-+                              err = -EAGAIN;
-+                              goto out;
-                       case -ENOMEM:
-                       case -NFS4ERR_DENIED:
-                               /* kill_proc(fl->fl_pid, SIGLOST, 1); */

diff --git a/queue-3.0/series b/queue-3.0/series
index c89b375a4e5d9c2b17485da4c18bca8f9a8c3365..f147444ff1428b0b281ad340ea6c805f19587ddd 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -33,7 +33,6 @@ drivers-rtc-rtc-cmos.c-don-t-disable-hpet-emulation-on-suspend.patch
 cgroup-fix-an-off-by-one-bug-which-may-trigger-bug_on.patch
 clockevents-set-dummy-handler-on-cpu_dead-shutdown.patch
 lockd-ensure-that-nlmclnt_block-resets-block-b_status-after-a-server-reboot.patch
-nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch
 nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_open_delegation_recall.patch
 nfsd4-don-t-close-read-write-opens-too-soon.patch
 nfsd-decode-and-send-64bit-time-values.patch