Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfsd: fix error values returned by nfsd4_lockt() when nfsd_open() fails

Browse Source 
nfsd_open() already returns an NFS error value; only vfs_test_lock()
result needs to be fed through nfserrno().  Broken by commit 55ef12
(nfsd: Ensure nfsv4 calls the underlying filesystem on LOCKT)
three years ago...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-04-13 00:00:04 -04:00
parent 96f6f98501
commit 04da6e9d63
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/nfsd/nfs4state.c
View File

@ -4211,16 +4211,14 @@ out:
* vfs_test_lock. (Arguably perhaps test_lock should be done with an * vfs_test_lock. (Arguably perhaps test_lock should be done with an
* inode operation.) * inode operation.)
*/ */
static int nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock) static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)
{ {
struct file *file; struct file *file;
int err; __be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
if (!err) {
err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); err = nfserrno(vfs_test_lock(file, lock));
if (err) nfsd_close(file);
return err; }
err = vfs_test_lock(file, lock);
nfsd_close(file);
return err; return err;
} }
@ -4234,7 +4232,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct inode *inode; struct inode *inode;
struct file_lock file_lock; struct file_lock file_lock;
struct nfs4_lockowner *lo; struct nfs4_lockowner *lo;
int error;
__be32 status; __be32 status;
if (locks_in_grace()) if (locks_in_grace())
@ -4280,12 +4277,10 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
nfs4_transform_lock_offset(&file_lock); nfs4_transform_lock_offset(&file_lock);
status = nfs_ok; status = nfsd_test_lock(rqstp, &cstate->current_fh, &file_lock);
error = nfsd_test_lock(rqstp, &cstate->current_fh, &file_lock); if (status)
if (error) {
status = nfserrno(error);
goto out; goto out;
}
if (file_lock.fl_type != F_UNLCK) { if (file_lock.fl_type != F_UNLCK) {
status = nfserr_denied; status = nfserr_denied;
nfs4_set_lock_denied(&file_lock, &lockt->lt_denied); nfs4_set_lock_denied(&file_lock, &lockt->lt_denied);