lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 170/357] nfs: fix error handling in lock_and_join_requests
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: Weston Andros Adamson <dros@primarydata.com>

    commit 94970014c46223cbcdfbfc67b89596a412f9e3dd upstream.

    This fixes handling of errors from nfs_page_group_lock in
    nfs_lock_and_join_requests. It now releases the inode lock and the
    reference to the head request.

    Reported-by: Peng Tao <tao.peng@primarydata.com>
    Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
    Reviewed-by: Peng Tao <tao.peng@primarydata.com>
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/nfs/write.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/fs/nfs/write.c
    +++ b/fs/nfs/write.c
    @@ -455,8 +455,11 @@ try_again:

    /* lock each request in the page group */
    ret = nfs_page_group_lock(head, true);
    - if (ret < 0)
    + if (ret < 0) {
    + spin_unlock(&inode->i_lock);
    + nfs_release_request(head);
    return ERR_PTR(ret);
    + }
    subreq = head;
    do {
    /*



    \
     
     \ /
      Last update: 2014-10-04 03:01    [W:3.085 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site