From: Greg Kroah-Hartman Date: Sun, 5 May 2013 04:54:04 +0000 (-0700) Subject: removed nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall... X-Git-Tag: v3.0.77~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=693c0dee060fad23ea5fbedfc9c072315b23cd79;p=thirdparty%2Fkernel%2Fstable-queue.git removed nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch from 3.4 and 3.8 --- diff --git a/queue-3.4/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch b/queue-3.4/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch deleted file mode 100644 index 93ace4c481b..00000000000 --- a/queue-3.4/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 -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 - -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 -Signed-off-by: Greg Kroah-Hartman - ---- - fs/nfs/nfs4proc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/fs/nfs/nfs4proc.c -+++ b/fs/nfs/nfs4proc.c -@@ -4874,6 +4874,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.4/series b/queue-3.4/series index b29d8fb840a..e00489f9daf 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -45,7 +45,6 @@ clockevents-set-dummy-handler-on-cpu_dead-shutdown.patch fs-dcache.c-add-cond_resched-to-shrink_dcache_parent.patch lockd-ensure-that-nlmclnt_block-resets-block-b_status-after-a-server-reboot.patch md-bad-block-list-should-default-to-disabled.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 diff --git a/queue-3.8/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch b/queue-3.8/nfsv4-handle-nfs4err_delay-and-nfs4err_grace-in-nfs4_lock_delegation_recall.patch deleted file mode 100644 index 2f715e6c363..00000000000 --- a/queue-3.8/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 -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 - -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 -Signed-off-by: Greg Kroah-Hartman - ---- - fs/nfs/nfs4proc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/fs/nfs/nfs4proc.c -+++ b/fs/nfs/nfs4proc.c -@@ -4978,6 +4978,12 @@ int nfs4_lock_delegation_recall(struct n - nfs4_schedule_stateid_recovery(server, state); - 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.8/series b/queue-3.8/series index 3865c952653..fed548ac5c1 100644 --- a/queue-3.8/series +++ b/queue-3.8/series @@ -81,7 +81,6 @@ exec-do-not-abuse-cred_guard_mutex-in-threadgroup_lock.patch lockd-ensure-that-nlmclnt_block-resets-block-b_status-after-a-server-reboot.patch md-bad-block-list-should-default-to-disabled.patch md-ignore-discard-request-for-hard-disks-of-hybid-raid1-raid10-array.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-don-t-run-get_file-if-nfs4_preprocess_stateid_op-return-error.patch