lkml.org 
[lkml]   [2007]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[patch 1/1] epoll move kfree inside ep_free ...
    Move the kfree() call inside the ep_free() function.


    Signed-off-by: Davide Libenzi <davidel@xmailserver.org>


    - Davide



    Index: linux-2.6.21-git17.epmod/fs/eventpoll.c
    ===================================================================
    --- linux-2.6.21-git17.epmod.orig/fs/eventpoll.c 2007-05-13 12:39:09.000000000 -0700
    +++ linux-2.6.21-git17.epmod/fs/eventpoll.c 2007-05-13 12:40:04.000000000 -0700
    @@ -469,18 +469,16 @@
    }

    mutex_unlock(&epmutex);
    -
    mutex_destroy(&ep->mtx);
    + kfree(ep);
    }

    static int ep_eventpoll_release(struct inode *inode, struct file *file)
    {
    struct eventpoll *ep = file->private_data;

    - if (ep) {
    + if (ep)
    ep_free(ep);
    - kfree(ep);
    - }

    DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));
    return 0;
    @@ -1107,7 +1105,6 @@

    error_free:
    ep_free(ep);
    - kfree(ep);
    error_return:
    DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
    current, size, error));
    -
    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-05-13 21:45    [W:0.020 / U:34.488 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site