diff options
author | Benjamin Coddington <bcodding@redhat.com> | 2019-05-20 16:33:07 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2019-05-31 15:43:26 +0200 |
commit | 141731d15d6eb2fd9aaefbf9b935ce86ae243074 (patch) | |
tree | 0be05c9f4ff705e38fb718bf9d900231e4115036 /fs/lockd/xdr4.c | |
parent | Linux 5.2-rc2 (diff) | |
download | linux-141731d15d6eb2fd9aaefbf9b935ce86ae243074.tar.xz linux-141731d15d6eb2fd9aaefbf9b935ce86ae243074.zip |
Revert "lockd: Show pid of lockd for remote locks"
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>
Diffstat (limited to '')
-rw-r--r-- | fs/lockd/xdr4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index 70154f376695..7ed9edf9aed4 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c @@ -119,7 +119,7 @@ nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) locks_init_lock(fl); fl->fl_owner = current->files; - fl->fl_pid = current->tgid; + fl->fl_pid = (pid_t)lock->svid; fl->fl_flags = FL_POSIX; fl->fl_type = F_RDLCK; /* as good as anything else */ p = xdr_decode_hyper(p, &start); @@ -266,7 +266,7 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) memset(lock, 0, sizeof(*lock)); locks_init_lock(&lock->fl); lock->svid = ~(u32) 0; - lock->fl.fl_pid = current->tgid; + lock->fl.fl_pid = (pid_t)lock->svid; if (!(p = nlm4_decode_cookie(p, &argp->cookie)) || !(p = xdr_decode_string_inplace(p, &lock->caller, |