aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-20 09:43:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-20 09:43:40 +0200
commitc4d41d00552754cc8cdd66a52da9b7c203884d49 (patch)
tree60be0f3d543ad6d300a033d91dc313bc595cd737 /fs/nfs/file.c
parenthpilo: Replace one-element array with flexible-array member (diff)
parentLinux 5.8-rc6 (diff)
downloadwireguard-linux-c4d41d00552754cc8cdd66a52da9b7c203884d49.tar.xz
wireguard-linux-c4d41d00552754cc8cdd66a52da9b7c203884d49.zip
Merge v5.8-rc6 into char-misc-next
We need the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index ccd6c1637b27..f96367a2463e 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -83,7 +83,6 @@ nfs_file_release(struct inode *inode, struct file *filp)
dprintk("NFS: release(%pD2)\n", filp);
nfs_inc_stats(inode, NFSIOS_VFSRELEASE);
- inode_dio_wait(inode);
nfs_file_clear_open_context(filp);
return 0;
}