| From: "J. Bruce Fields" <bfields@redhat.com> |
| Date: Thu, 28 Mar 2013 20:37:14 -0400 |
| Subject: nfsd4: don't close read-write opens too soon |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5 upstream. |
| |
| 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> |
| Signed-off-by: J. Bruce Fields <bfields@redhat.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| fs/nfsd/nfs4state.c | 8 +------- |
| 1 file changed, 1 insertion(+), 7 deletions(-) |
| |
| --- a/fs/nfsd/nfs4state.c |
| +++ b/fs/nfsd/nfs4state.c |
| @@ -188,13 +188,7 @@ static void __nfs4_file_put_access(struc |
| { |
| 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); |
| } |
| } |
