lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 068/177] NFS: Fix an Oopsable condition in __nfs_pageio_add_request()
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    commit 56517ab958b7c11030e626250c00b9b1a24b41eb upstream.

    Ensure that nfs_pageio_error_cleanup() resets the mirror array contents,
    so that the structure reflects the fact that it is now empty.
    Also change the test in nfs_pageio_do_add_request() to be more robust by
    checking whether or not the list is empty rather than relying on the
    value of pg_count.

    Fixes: a7d42ddb3099 ("nfs: add mirroring support to pgio layer")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/nfs/pagelist.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/fs/nfs/pagelist.c
    +++ b/fs/nfs/pagelist.c
    @@ -986,15 +986,16 @@ static int nfs_pageio_do_add_request(str

    struct nfs_page *prev = NULL;

    - if (mirror->pg_count != 0) {
    - prev = nfs_list_entry(mirror->pg_list.prev);
    - } else {
    + if (list_empty(&mirror->pg_list)) {
    if (desc->pg_ops->pg_init)
    desc->pg_ops->pg_init(desc, req);
    if (desc->pg_error < 0)
    return 0;
    mirror->pg_base = req->wb_pgbase;
    - }
    + mirror->pg_count = 0;
    + mirror->pg_recoalesce = 0;
    + } else
    + prev = nfs_list_entry(mirror->pg_list.prev);

    if (desc->pg_maxretrans && req->wb_nio > desc->pg_maxretrans) {
    if (NFS_SERVER(desc->pg_inode)->flags & NFS_MOUNT_SOFTERR)

    \
     
     \ /
      Last update: 2021-05-31 17:33    [W:9.638 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site