summaryrefslogtreecommitdiffstats
path: root/scripts/bootgraph.pl
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2015-03-20 15:56:40 +0800
committerJ. Bruce Fields <bfields@redhat.com>2015-03-20 12:43:06 -0400
commit715a03d2848275269bd4014a49212cc83452f32d (patch)
tree35923d9cecb4d7c1334d7ae925764aa62fbe3991 /scripts/bootgraph.pl
parent133d558216d9db3617a9fdeebd1bce9afff5f973 (diff)
downloadop-kernel-dev-715a03d2848275269bd4014a49212cc83452f32d.zip
op-kernel-dev-715a03d2848275269bd4014a49212cc83452f32d.tar.gz
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 'scripts/bootgraph.pl')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud