diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2015-03-20 15:56:40 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-03-20 12:43:06 -0400 |
| commit | 715a03d2848275269bd4014a49212cc83452f32d (patch) | |
| tree | 35923d9cecb4d7c1334d7ae925764aa62fbe3991 /fs/nfsd/nfs4layouts.c | |
| parent | 133d558216d9db3617a9fdeebd1bce9afff5f973 (diff) | |
| download | linux-715a03d2848275269bd4014a49212cc83452f32d.tar.bz2 | |
NFSD: restore trace event lost in mismerge
31ef83dc05 "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. 133d558216d9 "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>
Diffstat (limited to 'fs/nfsd/nfs4layouts.c')
| -rw-r--r-- | fs/nfsd/nfs4layouts.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 1028a0629543..0a616b51c5bb 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -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); |