android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: remove nfsd_close

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Christoph Hellwig 2015-04-28 15:41:16 +02:00 committed by J. Bruce Fields
parent 4bd9e9b77f
commit fd89145460
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfs4state.c
View File

@ -5505,7 +5505,7 @@ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct
__be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); __be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
if (!err) { if (!err) {
err = nfserrno(vfs_test_lock(file, lock)); err = nfserrno(vfs_test_lock(file, lock));
nfsd_close(file); fput(file);
} }
return err; return err;
} }

19
fs/nfsd/vfs.c
View File

@ -744,7 +744,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
host_err = ima_file_check(file, may_flags, 0); host_err = ima_file_check(file, may_flags, 0);
if (host_err) { if (host_err) {
nfsd_close(file); fput(file);
goto out_nfserr; goto out_nfserr;
} }
@ -761,15 +761,6 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
return err; return err;
} }
/*
* Close a file.
*/
void
nfsd_close(struct file *filp)
{
fput(filp);
}
/* /*
* Obtain the readahead parameters for the file * Obtain the readahead parameters for the file
* specified by (dev, ino). * specified by (dev, ino).
@ -1040,7 +1031,7 @@ void nfsd_put_tmp_read_open(struct file *file, struct raparms *ra)
ra->p_count--; ra->p_count--;
spin_unlock(&rab->pb_lock); spin_unlock(&rab->pb_lock);
} }
nfsd_close(file); fput(file);
} }
/* /*
@ -1093,7 +1084,7 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
if (cnt) if (cnt)
err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen,
cnt, stablep); cnt, stablep);
nfsd_close(file); fput(file);
} }
out: out:
return err; return err;
@ -1138,7 +1129,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
err = nfserr_notsupp; err = nfserr_notsupp;
} }
nfsd_close(file); fput(file);
out: out:
return err; return err;
} }
@ -1977,7 +1968,7 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,
if (err == nfserr_eof || err == nfserr_toosmall) if (err == nfserr_eof || err == nfserr_toosmall)
err = nfs_ok; /* can still be found in ->err */ err = nfs_ok; /* can still be found in ->err */
out_close: out_close:
nfsd_close(file); fput(file);
out: out:
return err; return err;
} }

1
fs/nfsd/vfs.h
View File

@ -71,7 +71,6 @@ __be32 nfsd_commit(struct svc_rqst *, struct svc_fh *,
#endif /* CONFIG_NFSD_V3 */ #endif /* CONFIG_NFSD_V3 */
__be32 nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t, __be32 nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t,
int, struct file **); int, struct file **);
void nfsd_close(struct file *);
struct raparms; struct raparms;
__be32 nfsd_get_tmp_read_open(struct svc_rqst *, struct svc_fh *, __be32 nfsd_get_tmp_read_open(struct svc_rqst *, struct svc_fh *,
struct file **, struct raparms **); struct file **, struct raparms **);