diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2019-05-23 16:45:47 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-07-03 23:52:09 +0200 |
| commit | 646d73e91b4222ea972953bad4374a5ca903e79d (patch) | |
| tree | fcd45f943866ade75475b66a11b579bb3d1c8a58 /fs/lockd/xdr.c | |
| parent | lockd: Remove lm_compare_owner and lm_owner_key (diff) | |
| download | linux-646d73e91b4222ea972953bad4374a5ca903e79d.tar.xz linux-646d73e91b4222ea972953bad4374a5ca903e79d.zip | |
lockd: Show pid of lockd for remote locks
Use the pid of lockd instead of the remote lock's svid for the fl_pid for
local POSIX locks. This allows proper enumeration of which local process
owns which lock. The svid is meaningless to local lock readers.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/xdr.c')
| -rw-r--r-- | fs/lockd/xdr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index ec717ae41ee3..982629f7b120 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -126,7 +126,6 @@ nlm_decode_lock(__be32 *p, struct nlm_lock *lock) lock->svid = ntohl(*p++); locks_init_lock(fl); - fl->fl_pid = (pid_t)lock->svid; fl->fl_flags = FL_POSIX; fl->fl_type = F_RDLCK; /* as good as anything else */ start = ntohl(*p++); @@ -268,7 +267,6 @@ nlmsvc_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 = (pid_t)lock->svid; if (!(p = nlm_decode_cookie(p, &argp->cookie)) || !(p = xdr_decode_string_inplace(p, &lock->caller, |