diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2019-05-23 17:45:45 +0300 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-07-04 00:52:08 +0300 |
| commit | 89e0edfbea103d9b274efa10a8fc7a88bdac8f76 (patch) | |
| tree | e13bb61003180e2cf10d5266af2a24052f5d4fff /fs/lockd/xdr.c | |
| parent | 9de3ec1d57113e270638254868675d9c048b071e (diff) | |
| download | linux-89e0edfbea103d9b274efa10a8fc7a88bdac8f76.tar.xz | |
lockd: Convert NLM service fl_owner to nlm_lockowner
Do as the NLM client: allocate and track a struct nlm_lockowner for use as
the fl_owner for locks created by the NLM sever. This allows us to keep
the svid within this structure for matching locks, and will allow us to
track the pid of lockd in a future patch. It should also allow easier
reference of the nlm_host in conflicting locks, and simplify lock hashing
and comparison.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
[bfields@redhat.com: fix type of some error returns]
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/xdr.c')
| -rw-r--r-- | fs/lockd/xdr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index 7147e4aebecc..ec717ae41ee3 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_owner = current->files; fl->fl_pid = (pid_t)lock->svid; fl->fl_flags = FL_POSIX; fl->fl_type = F_RDLCK; /* as good as anything else */ |