xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "nfsd: nfs4_file_get_access: need to be more careful with O_RDWR"

Browse Source 
This reverts commit df66e75395.

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>
This commit is contained in:
J. Bruce Fields
2013-08-23 17:55:18 -04:00
parent b8297cec2d
commit 3477565e6a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfsd/nfs4state.c
View File

@@ -282,14 +282,19 @@ static unsigned int file_hashval(struct inode *ino)
static struct hlist_head file_hashtbl[FILE_HASH_SIZE]; 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) static void nfs4_file_get_access(struct nfs4_file *fp, int oflag)
{ {
WARN_ON_ONCE(!fp->fi_fds[oflag]);
if (oflag == O_RDWR) { if (oflag == O_RDWR) {
atomic_inc(&fp->fi_access[O_RDONLY]); __nfs4_file_get_access(fp, O_RDONLY);
atomic_inc(&fp->fi_access[O_WRONLY]); __nfs4_file_get_access(fp, O_WRONLY);
} else } 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) static void nfs4_file_put_fd(struct nfs4_file *fp, int oflag)