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
This commit is contained in:
commit
0d122f7430
1 changed files with 0 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue