Commit 0c7c3e67 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarToralf Förster <toralf.foerster@gmx.de>
Cc: stable@kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent eb2099f3

fs/nfsd/nfs4state.c

+1 −7
Original line number Diff line number Diff line
@@ -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);

	}

}