lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[061/156] NFS: Prevent another deadlock in nfs_release_page()
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

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

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit d812e575822a2b7ab1a7cadae2571505ec6ec2bd upstream.

    We should not attempt to free the page if __GFP_FS is not set. Otherwise we
    can deadlock as per

    http://bugzilla.kernel.org/show_bug.cgi?id=15578

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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

    --- a/fs/nfs/file.c
    +++ b/fs/nfs/file.c
    @@ -486,7 +486,8 @@ static int nfs_release_page(struct page
    {
    dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);

    - if (gfp & __GFP_WAIT)
    + /* Only do I/O if gfp is a superset of GFP_KERNEL */
    + if ((gfp & GFP_KERNEL) == GFP_KERNEL)
    nfs_wb_page(page->mapping->host, page);
    /* If PagePrivate() is set, then the page is not freeable */
    if (PagePrivate(page))



    \
     
     \ /
      Last update: 2010-03-31 01:47    [W:4.293 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site