lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[147/289] nfs: handle lock context allocation failures in nfs_create_request
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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

    From: Jeff Layton <jlayton@redhat.com>

    commit 015f0212d51d85bd281a831639a769b4a1a3307a upstream.

    nfs_get_lock_context can return NULL on an allocation failure.
    Regression introduced by commit f11ac8db.

    Reported-by: Steve Dickson <steved@redhat.com>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfs/pagelist.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/fs/nfs/pagelist.c
    +++ b/fs/nfs/pagelist.c
    @@ -65,6 +65,13 @@ nfs_create_request(struct nfs_open_conte
    if (req == NULL)
    return ERR_PTR(-ENOMEM);

    + /* get lock context early so we can deal with alloc failures */
    + req->wb_lock_context = nfs_get_lock_context(ctx);
    + if (req->wb_lock_context == NULL) {
    + nfs_page_free(req);
    + return ERR_PTR(-ENOMEM);
    + }
    +
    /* Initialize the request struct. Initially, we assume a
    * long write-back delay. This will be adjusted in
    * update_nfs_request below if the region is not locked. */
    @@ -79,7 +86,6 @@ nfs_create_request(struct nfs_open_conte
    req->wb_pgbase = offset;
    req->wb_bytes = count;
    req->wb_context = get_nfs_open_context(ctx);
    - req->wb_lock_context = nfs_get_lock_context(ctx);
    kref_init(&req->wb_kref);
    return req;
    }



    \
     
     \ /
      Last update: 2010-12-08 02:35    [W:0.019 / U:0.088 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site