Revert "lockd: Show pid of lockd for remote locks"
authorBenjamin Coddington <bcodding@redhat.com>
Mon, 20 May 2019 14:33:07 +0000 (10:33 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2019 07:18:18 +0000 (09:18 +0200)
commit3420dcefabd8e909f3d31284baa9ef276d04fbdb
tree5259b93486822e2b9e6a2fbe35290e42a54f914f
parentdea5d380e22c1bd754cd3f02ac75ca544b4f656e
Revert "lockd: Show pid of lockd for remote locks"

commit 141731d15d6eb2fd9aaefbf9b935ce86ae243074 upstream.

This reverts most of commit b8eee0e90f97 ("lockd: Show pid of lockd for
remote locks"), which caused remote locks to not be differentiated between
remote processes for NLM.

We retain the fixup for setting the client's fl_pid to a negative value.

Fixes: b8eee0e90f97 ("lockd: Show pid of lockd for remote locks")
Cc: stable@vger.kernel.org
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: XueWei Zhang <xueweiz@google.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/lockd/xdr.c
fs/lockd/xdr4.c