diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2015-03-20 08:56:40 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-03-20 17:43:06 +0100 |
| commit | 715a03d2848275269bd4014a49212cc83452f32d (patch) | |
| tree | 35923d9cecb4d7c1334d7ae925764aa62fbe3991 /kernel/cgroup_freezer.c | |
| parent | Subject: nfsd: don't recursively call nfsd4_cb_layout_fail (diff) | |
| download | linux-715a03d2848275269bd4014a49212cc83452f32d.tar.xz linux-715a03d2848275269bd4014a49212cc83452f32d.zip | |
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 'kernel/cgroup_freezer.c')
0 files changed, 0 insertions, 0 deletions