Skip to content

Commit

Permalink
NFSD: restore trace event lost in mismerge
Browse files Browse the repository at this point in the history
31ef83d "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.  133d558 "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>
  • Loading branch information
kinglongmee authored and J. Bruce Fields committed Mar 20, 2015
1 parent 133d558 commit 715a03d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/nfsd/nfs4layouts.c
Expand Up @@ -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);
Expand Down

0 comments on commit 715a03d

Please sign in to comment.