Revert "nfsd: nfs4_file_get_access: need to be more careful with O_RDWR" (3477565e) · Commits · 戴 / test

This reverts commit . nfsd4_lock can get a read-only or write-only reference when only a read-write open is available. This is normal. Cc: Harshula Jayasuriya <harshula@redhat.com> Signed-off-by:

J. Bruce Fields <bfields@redhat.com>

fs/nfsd/nfs4state.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -282,14 +282,19 @@ static unsigned int file_hashval(struct inode *ino)

		static struct hlist_head file_hashtbl[FILE_HASH_SIZE];

		static void __nfs4_file_get_access(struct nfs4_file *fp, int oflag)
		{
		WARN_ON_ONCE(!(fp->fi_fds[oflag] \|\| fp->fi_fds[O_RDWR]));
		atomic_inc(&fp->fi_access[oflag]);
		}

		static void nfs4_file_get_access(struct nfs4_file *fp, int oflag)
		{
		WARN_ON_ONCE(!fp->fi_fds[oflag]);
		if (oflag == O_RDWR) {
		atomic_inc(&fp->fi_access[O_RDONLY]);
		atomic_inc(&fp->fi_access[O_WRONLY]);
		__nfs4_file_get_access(fp, O_RDONLY);
		__nfs4_file_get_access(fp, O_WRONLY);
		} else
		atomic_inc(&fp->fi_access[oflag]);
		__nfs4_file_get_access(fp, oflag);
		}

		static void nfs4_file_put_fd(struct nfs4_file *fp, int oflag)

Admin message