diff options
| author | Jeff Layton | 2014-07-10 20:07:29 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2014-07-11 17:05:57 +0200 |
| commit | 6d338b51eb6e37b4d6f1459c892f5ec7df0dad88 (patch) | |
| tree | 5a5195516d9dc71eff45f7b25b0275c8eb1372e3 | |
| parent | nfsd: refactor nfs4_file_get_access and nfs4_file_put_access (diff) | |
| download | kernel-qcow2-linux-6d338b51eb6e37b4d6f1459c892f5ec7df0dad88.tar.gz kernel-qcow2-linux-6d338b51eb6e37b4d6f1459c892f5ec7df0dad88.tar.xz kernel-qcow2-linux-6d338b51eb6e37b4d6f1459c892f5ec7df0dad88.zip | |
nfsd: remove nfs4_file_put_fd
...and replace it with a simple swap call.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a19257f91f25..c02bad6d7e90 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -394,15 +394,6 @@ nfs4_file_get_access(struct nfs4_file *fp, u32 access) return nfs_ok; } -static struct file *nfs4_file_put_fd(struct nfs4_file *fp, int oflag) -{ - struct file *filp; - - filp = fp->fi_fds[oflag]; - fp->fi_fds[oflag] = NULL; - return filp; -} - static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) { might_lock(&fp->fi_lock); @@ -411,9 +402,9 @@ static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) struct file *f1 = NULL; struct file *f2 = NULL; - f1 = nfs4_file_put_fd(fp, oflag); + swap(f1, fp->fi_fds[oflag]); if (atomic_read(&fp->fi_access[1 - oflag]) == 0) - f2 = nfs4_file_put_fd(fp, O_RDWR); + swap(f2, fp->fi_fds[O_RDWR]); spin_unlock(&fp->fi_lock); if (f1) fput(f1); |