summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-21 10:41:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-21 10:41:15 -0700
commit0d122f7430ed4c4298e33e0d70dc4065679720a2 (patch)
tree3ca52bed36b724e2b66cbf4775dd4ea1cce75dd3
parentc6ef814509fedb4ab4b5dc5bdca309d4e7181597 (diff)
parent133d558216d9db3617a9fdeebd1bce9afff5f973 (diff)
downloadlinux-sh-0d122f7430ed4c4298e33e0d70dc4065679720a2.tar.gz
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
Pull nfsd bufix from Bruce Fields: "This is a fix for a crash easily triggered by 4.1 activity to a server built with CONFIG_NFSD_PNFS. There are some more bugfixes queued up that I intend to pass along next week, but this is the most critical" * 'for-4.0' of git://linux-nfs.org/~bfields/linux: Subject: nfsd: don't recursively call nfsd4_cb_layout_fail
-rw-r--r--fs/nfsd/nfs4layouts.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 3c1bfa155571..1028a0629543 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -587,8 +587,6 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)
rpc_ntop((struct sockaddr *)&clp->cl_addr, addr_str, sizeof(addr_str));
- nfsd4_cb_layout_fail(ls);
-
printk(KERN_WARNING
"nfsd: client %s failed to respond to layout recall. "
" Fencing..\n", addr_str);