]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 38a86f2) | patch
NFSD: restore trace event lost in mismerge
authorKinglong Mee <kinglongmee@gmail.com>
Fri, 20 Mar 2015 07:56:40 +0000 (15:56 +0800)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 20 Mar 2015 16:43:06 +0000 (12:43 -0400)
commita1c88875876a076e9c5d1b72200a177188e49d3b
tree35923d9cecb4d7c1334d7ae925764aa62fbe3991tree | snapshot
parent38a86f283c32cced8dc5e49296dddf26e11fef17commit | diff
NFSD: restore trace event lost in mismerge

bae6491728 "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.  38a86f283c32 "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>
fs/nfsd/nfs4layouts.c diff | blob | history
Linux Kernel Source Tree.