mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
nfsd: fix crash on LOCKT on reexported NFSv3
[ Upstream commit 0bcc7ca40b
]
Unlike other filesystems, NFSv3 tries to use fl_file in the GETLK case.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e97d534f3e
commit
2d23385df5
1 changed files with 3 additions and 2 deletions
|
@ -7040,8 +7040,7 @@ out:
|
|||
/*
|
||||
* The NFSv4 spec allows a client to do a LOCKT without holding an OPEN,
|
||||
* so we do a temporary open here just to get an open file to pass to
|
||||
* vfs_test_lock. (Arguably perhaps test_lock should be done with an
|
||||
* inode operation.)
|
||||
* vfs_test_lock.
|
||||
*/
|
||||
static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)
|
||||
{
|
||||
|
@ -7056,7 +7055,9 @@ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct
|
|||
NFSD_MAY_READ));
|
||||
if (err)
|
||||
goto out;
|
||||
lock->fl_file = nf->nf_file;
|
||||
err = nfserrno(vfs_test_lock(nf->nf_file, lock));
|
||||
lock->fl_file = NULL;
|
||||
out:
|
||||
fh_unlock(fhp);
|
||||
nfsd_file_put(nf);
|
||||
|
|
Loading…
Add table
Reference in a new issue