From: Trond Myklebust Date: Thu, 19 Jan 2023 21:33:51 +0000 (-0500) Subject: NFS: Remove unnecessary check in nfs_read_folio() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2de3d04b3bcba3ae0474373cbd0c85f4f09ed9d2;p=linux.git NFS: Remove unnecessary check in nfs_read_folio() All the callers are expected to supply a valid struct file argument, so there is no need for the NULL check. Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker --- diff --git a/fs/nfs/read.c b/fs/nfs/read.c index bf4154f9b48c5..c380cff4108e0 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -355,13 +355,7 @@ int nfs_read_folio(struct file *file, struct folio *folio) if (NFS_STALE(inode)) goto out_unlock; - if (file == NULL) { - ret = -EBADF; - desc.ctx = nfs_find_open_context(inode, NULL, FMODE_READ); - if (desc.ctx == NULL) - goto out_unlock; - } else - desc.ctx = get_nfs_open_context(nfs_file_open_context(file)); + desc.ctx = get_nfs_open_context(nfs_file_open_context(file)); xchg(&desc.ctx->error, 0); nfs_pageio_init_read(&desc.pgio, inode, false,