lkml.org 
[lkml]   [2020]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 181/191] cachefiles: Handle readpage error correctly
    Date
    From: Matthew Wilcox (Oracle) <willy@infradead.org>

    commit 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 upstream.

    If ->readpage returns an error, it has already unlocked the page.

    Fixes: 5e929b33c393 ("CacheFiles: Handle truncate unlocking the page we're reading")
    Cc: stable@vger.kernel.org
    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cachefiles/rdwr.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/fs/cachefiles/rdwr.c
    +++ b/fs/cachefiles/rdwr.c
    @@ -125,7 +125,7 @@ static int cachefiles_read_reissue(struc
    _debug("reissue read");
    ret = bmapping->a_ops->readpage(NULL, backpage);
    if (ret < 0)
    - goto unlock_discard;
    + goto discard;
    }

    /* but the page may have been read before the monitor was installed, so
    @@ -142,6 +142,7 @@ static int cachefiles_read_reissue(struc

    unlock_discard:
    unlock_page(backpage);
    +discard:
    spin_lock_irq(&object->work_lock);
    list_del(&monitor->op_link);
    spin_unlock_irq(&object->work_lock);

    \
     
     \ /
      Last update: 2020-11-03 22:08    [W:4.158 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site