lkml.org 
[lkml]   [2005]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/4] resource release cleanup in net/ (take 2)
    On Sun, 1 May 2005, Jesper Juhl wrote:

    > On Sat, 30 Apr 2005, Arnaldo Carvalho de Melo wrote:
    >
    > > On 4/30/05, Jesper Juhl <juhl-lkml@dif.dk> wrote:
    > > > Hi David,
    > > >
    > > > Since Andrew merged the patch that makes calling crypto_free_tfm() with a
    > > > NULL pointer safe into 2.6.12-rc3-mm1, I made a patch to remove checks for
    > > > NULL before calling that function, and while I was at it I removed similar
    > > > redundant checks before calls to kfree() and vfree() in the same files.
    > > > There are also a few tiny whitespace cleanups in there.
    > >
    > > Jesper, I'd suggest that you left whitespaces for a separate patch, it
    > > is always,
    > > IMHO, better to have as small a patch as possible for reviewing.
    > >
    > Sure thing. I've split the patches, and I believe that me going through
    > them a second time did them good, there are a few tiny changes over the
    > first version.
    >
    > I split the patch in 4 parts (will send as replies to this mail) :
    > 1) crypto_free_tfm related changes
    > 2) kfree related changes
    > 3) vfree related changes
    > 4) whitespace changes
    > The whitespace changes ended up fairly bigger than initially. I expanded
    > the cleanup a bit. It's not a perfect, 100% complete cleanup, but it's IMO
    > a lot better than the originals.
    >

    These are the vfree changes. Incremental patch on top of patch 2.


    Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
    ---
    net/ipv4/ipcomp.c | 3 +--
    net/ipv6/ipcomp6.c | 3 +--
    2 files changed, 2 insertions(+), 4 deletions(-)
    --- linux-2.6.12-rc3-mm1/net/ipv4/ipcomp.c.old2 2005-05-01 03:23:56.000000000 +0200
    +++ linux-2.6.12-rc3-mm1/net/ipv4/ipcomp.c 2005-05-01 03:24:09.000000000 +0200
    @@ -296,8 +296,7 @@

    for_each_cpu(i) {
    void *scratch = *per_cpu_ptr(scratches, i);
    - if (scratch)
    - vfree(scratch);
    + vfree(scratch);
    }

    free_percpu(scratches);
    --- linux-2.6.12-rc3-mm1/net/ipv6/ipcomp6.c.old2 2005-05-01 03:23:56.000000000 +0200
    +++ linux-2.6.12-rc3-mm1/net/ipv6/ipcomp6.c 2005-05-01 03:24:09.000000000 +0200
    @@ -291,8 +291,7 @@

    for_each_cpu(i) {
    void *scratch = *per_cpu_ptr(scratches, i);
    - if (scratch)
    - vfree(scratch);
    + vfree(scratch);
    }

    free_percpu(scratches);

    -
    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: 2005-05-01 03:56    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean