Commit 715a03d2 authored Mar 20, 2015 by Kinglong Mee Committed by J. Bruce Fields Mar 20, 2015

NFSD: restore trace event lost in mismerge



31ef83dc "nfsd: add trace events" had a typo that dropped a trace
event and replaced it by an incorrect recursive call to
nfsd4_cb_layout_fail.  133d5582 "Subject: nfsd: don't recursively
call nfsd4_cb_layout_fail" fixed the crash, this restores the
tracepoint.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 133d5582

fs/nfsd/nfs4layouts.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -587,6 +587,8 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)

		rpc_ntop((struct sockaddr *)&clp->cl_addr, addr_str, sizeof(addr_str));

		trace_layout_recall_fail(&ls->ls_stid.sc_stateid);

		printk(KERN_WARNING
		"nfsd: client %s failed to respond to layout recall. "
		" Fencing..\n", addr_str);