From: Kinglong Mee <kinglongmee@gmail.com>
Date: Fri, 20 Mar 2015 07:56:40 +0000 (+0800)
Subject: NFSD: restore trace event lost in mismerge
X-Git-Tag: omap-for-v4.2/o2_dc~236^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=715a03d2848275269bd4014a49212cc83452f32d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed