summaryrefslogtreecommitdiff
path: root/fs/lockd/svc4proc.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2021-08-23 23:44:00 +0300
committerChuck Lever <chuck.lever@oracle.com>2021-08-24 01:05:31 +0300
commit7f024fcd5c97dc70bb9121c80407cf3cf9be7159 (patch)
tree069bd48a61ba4d33bd1f981e3e9d616c262030b5 /fs/lockd/svc4proc.c
parentb661601a9fdf1af8516e1100de8bba84bd41cca4 (diff)
downloadlinux-7f024fcd5c97dc70bb9121c80407cf3cf9be7159.tar.xz
Keep read and write fds with each nlm_file
We shouldn't really be using a read-only file descriptor to take a write lock. Most filesystems will put up with it. But NFS, for example, won't. Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/lockd/svc4proc.c')
-rw-r--r--fs/lockd/svc4proc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index bc496bbd696b..e10ae2c41279 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -40,13 +40,15 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
/* Obtain file pointer. Not used by FREE_ALL call. */
if (filp != NULL) {
+ int mode = lock_to_openmode(&lock->fl);
+
error = nlm_lookup_file(rqstp, &file, lock);
if (error)
goto no_locks;
*filp = file;
/* Set up the missing parts of the file_lock structure */
- lock->fl.fl_file = file->f_file;
+ lock->fl.fl_file = file->f_file[mode];
lock->fl.fl_pid = current->tgid;
lock->fl.fl_lmops = &nlmsvc_lock_operations;
nlmsvc_locks_init_private(&lock->fl, host, (pid_t)lock->svid);