summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 14:25:16 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 14:25:16 -0400
commita1a2fc07bbb771a64f77e744f45e03f83fc17900 (patch)
tree6c344187ee88a03d47181dc0ed3279b764cfe4a9
parente6eda094da83c19686fe9b2ea5e14e146fbade95 (diff)
downloadlongterm-queue-4.8-a1a2fc07bbb771a64f77e744f45e03f83fc17900.tar.gz
nfs: refresh ENOKEY patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/nfsd-map-the-ENOKEY-to-nfserr_perm-for-avoiding-warn.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/nfsd-map-the-ENOKEY-to-nfserr_perm-for-avoiding-warn.patch b/queue/nfsd-map-the-ENOKEY-to-nfserr_perm-for-avoiding-warn.patch
index 84c9eb6..043bc74 100644
--- a/queue/nfsd-map-the-ENOKEY-to-nfserr_perm-for-avoiding-warn.patch
+++ b/queue/nfsd-map-the-ENOKEY-to-nfserr_perm-for-avoiding-warn.patch
@@ -1,4 +1,4 @@
-From c952cd4e949ab3d07287efc2e80246e03727d15d Mon Sep 17 00:00:00 2001
+From 2ded11f71953e607f4141f84955ae6a3479fc157 Mon Sep 17 00:00:00 2001
From: Kinglong Mee <kinglongmee@gmail.com>
Date: Fri, 10 Mar 2017 09:52:20 +0800
Subject: [PATCH] nfsd: map the ENOKEY to nfserr_perm for avoiding warning
@@ -44,13 +44,13 @@ Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
-index fa82b7707e85..03a7e9da4da0 100644
+index e9214768cde9..460ce0d2d74b 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
-@@ -786,6 +786,7 @@ nfserrno (int errno)
+@@ -791,6 +791,7 @@ nfserrno (int errno)
+ { nfserr_toosmall, -ETOOSMALL },
{ nfserr_serverfault, -ESERVERFAULT },
{ nfserr_serverfault, -ENFILE },
- { nfserr_io, -EUCLEAN },
+ { nfserr_perm, -ENOKEY },
};
int i;