lkml.org 
[lkml]   [2007]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH] JBD slab cleanups
    From
    Date
    On Wed, 2007-09-19 at 13:48 -0600, Andreas Dilger wrote:
    > On Sep 19, 2007 12:15 -0700, Mingming Cao wrote:
    > > @@ -96,8 +96,7 @@ static int start_this_handle(journal_t *
    > >
    > > alloc_transaction:
    > > if (!journal->j_running_transaction) {
    > > - new_transaction = kmalloc(sizeof(*new_transaction),
    > > - GFP_NOFS|__GFP_NOFAIL);
    > > + new_transaction = kmalloc(sizeof(*new_transaction), GFP_NOFS);
    >
    > This should probably be a __GFP_NOFAIL if we are trying to start a new
    > handle in truncate, as there is no way to propagate an error to the caller.
    >

    Thanks, updated version.

    Here is the patch to clean up __GFP_NOFAIL flag in jbd/jbd2, most cases
    they are not needed.

    Signed-off-by: Mingming Cao <cmm@us.ibm.com>
    ---
    fs/jbd/journal.c | 2 +-
    fs/jbd2/journal.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6.23-rc6/fs/jbd/journal.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/jbd/journal.c 2007-09-19 11:47:58.000000000 -0700
    +++ linux-2.6.23-rc6/fs/jbd/journal.c 2007-09-19 14:23:45.000000000 -0700
    @@ -653,7 +653,7 @@ static journal_t * journal_init_common (
    journal_t *journal;
    int err;

    - journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
    + journal = kmalloc(sizeof(*journal), GFP_KERNEL);
    if (!journal)
    goto fail;
    memset(journal, 0, sizeof(*journal));
    Index: linux-2.6.23-rc6/fs/jbd2/journal.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/jbd2/journal.c 2007-09-19 11:48:14.000000000 -0700
    +++ linux-2.6.23-rc6/fs/jbd2/journal.c 2007-09-19 14:23:45.000000000 -0700
    @@ -654,7 +654,7 @@ static journal_t * journal_init_common (
    journal_t *journal;
    int err;

    - journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
    + journal = kmalloc(sizeof(*journal), GFP_KERNEL);
    if (!journal)
    goto fail;
    memset(journal, 0, sizeof(*journal));

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-20 00:07    [W:0.022 / U:150.304 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site