AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 03:30:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: nfs_find_open_context() may only select open files

Browse Source 
[ Upstream commit e97bc66377bca097e1f3349ca18ca17f202ff659 ]

If a file has already been closed, then it should not be selected to
support further I/O.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
[Trond: Fix an invalid pointer deref reported by Colin Ian King]
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Trond Myklebust 2021-05-11 23:41:10 -04:00 committed by Greg Kroah-Hartman
parent 0fedfa72ae
commit 89786fbc4d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/inode.c
View File

@ -1064,6 +1064,7 @@ EXPORT_SYMBOL_GPL(nfs_inode_attach_open_context);
void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx) void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx)
{ {
filp->private_data = get_nfs_open_context(ctx); filp->private_data = get_nfs_open_context(ctx);
set_bit(NFS_CONTEXT_FILE_OPEN, &ctx->flags);
if (list_empty(&ctx->list)) if (list_empty(&ctx->list))
nfs_inode_attach_open_context(ctx); nfs_inode_attach_open_context(ctx);
} }
@ -1083,6 +1084,8 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, const struct
continue; continue;
if ((pos->mode & (FMODE_READ|FMODE_WRITE)) != mode) if ((pos->mode & (FMODE_READ|FMODE_WRITE)) != mode)
continue; continue;
if (!test_bit(NFS_CONTEXT_FILE_OPEN, &pos->flags))
continue;
ctx = get_nfs_open_context(pos); ctx = get_nfs_open_context(pos);
if (ctx) if (ctx)
break; break;
@ -1098,6 +1101,7 @@ void nfs_file_clear_open_context(struct file *filp)
if (ctx) { if (ctx) {
struct inode *inode = d_inode(ctx->dentry); struct inode *inode = d_inode(ctx->dentry);
clear_bit(NFS_CONTEXT_FILE_OPEN, &ctx->flags);
/* /*
* We fatal error on write before. Try to writeback * We fatal error on write before. Try to writeback
* every page again. * every page again.

1
include/linux/nfs_fs.h
View File

@ -79,6 +79,7 @@ struct nfs_open_context {
#define NFS_CONTEXT_RESEND_WRITES (1) #define NFS_CONTEXT_RESEND_WRITES (1)
#define NFS_CONTEXT_BAD (2) #define NFS_CONTEXT_BAD (2)
#define NFS_CONTEXT_UNLOCK (3) #define NFS_CONTEXT_UNLOCK (3)
#define NFS_CONTEXT_FILE_OPEN (4)
int error; int error;
struct list_head list; struct list_head list;