Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d122f74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c6ef8145 133d5582

fs/nfsd/nfs4layouts.c

+0 −2
Original line number Diff line number Diff line
@@ -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);