summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-03-28 20:37:14 -0400
committerJ. Bruce Fields <bfields@redhat.com>2013-04-09 09:08:57 -0400
commit0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5 (patch)
treea78bba34de95062dea4bc512a9a03023c24c686b /fs/nfsd
parenteb2099f31b0f090684a64ef8df44a30ff7c45fc2 (diff)
downloadblackbird-op-linux-0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5.tar.gz
blackbird-op-linux-0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5.zip
nfsd4: don't close read-write opens too soon
Don't actually close any opens until we don't need them at all. This means being left with write access when it's not really necessary, but that's better than putting a file that might still have posix locks held on it, as we have been. Reported-by: Toralf Förster <toralf.foerster@gmx.de> Cc: stable@kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index ff1577d6df62..7d2e3b54b9df 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -307,13 +307,7 @@ static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag)
{
if (atomic_dec_and_test(&fp->fi_access[oflag])) {
nfs4_file_put_fd(fp, oflag);
- /*
- * It's also safe to get rid of the RDWR open *if*
- * we no longer have need of the other kind of access
- * or if we already have the other kind of open:
- */
- if (fp->fi_fds[1-oflag]
- || atomic_read(&fp->fi_access[1 - oflag]) == 0)
+ if (atomic_read(&fp->fi_access[1 - oflag]) == 0)
nfs4_file_put_fd(fp, O_RDWR);
}
}
OpenPOWER on IntegriCloud