lkml.org 
[lkml]   [2008]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH -mm] list.h: rename list_singleton to list_is_singular
    Rename list_singleton to list_is_singular.

    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    ---
    Peter Zijlstra wrote:
    > I think list_has_one() or list_is_singular() are good names, they convey
    > they are a test for a condition by using a form of be.

    OK, I picked up list_is_singular().

    Thanks,

    include/linux/list.h | 4 ++--
    kernel/kprobes.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    Index: 2.6.25-rc5-mm1/include/linux/list.h
    ===================================================================
    --- 2.6.25-rc5-mm1.orig/include/linux/list.h
    +++ 2.6.25-rc5-mm1/include/linux/list.h
    @@ -212,10 +212,10 @@ static inline int list_empty_careful(con
    }

    /**
    - * list_singleton - tests whether a list has just one entry.
    + * list_is_singular - tests whether a list has just one entry.
    * @head: the list to test.
    */
    -static inline int list_singleton(const struct list_head *head)
    +static inline int list_is_singular(const struct list_head *head)
    {
    return !list_empty(head) && (head->next == head->prev);
    }
    Index: 2.6.25-rc5-mm1/kernel/kprobes.c
    ===================================================================
    --- 2.6.25-rc5-mm1.orig/kernel/kprobes.c
    +++ 2.6.25-rc5-mm1/kernel/kprobes.c
    @@ -643,7 +643,7 @@ static int __kprobes __unregister_kprobe
    valid_p:
    if (old_p == p ||
    (old_p->pre_handler == aggr_pre_handler &&
    - list_singleton(&old_p->list))) {
    + list_is_singular(&old_p->list))) {
    /*
    * Only probe on the hash list. Disarm only if kprobes are
    * enabled - otherwise, the breakpoint would already have
    @@ -679,7 +679,7 @@ static void __kprobes __unregister_kprob
    module_put(mod);
    }

    - if (list_empty(&p->list) || list_singleton(&p->list)) {
    + if (list_empty(&p->list) || list_is_singular(&p->list)) {
    if (!list_empty(&p->list)) {
    /* "p" is the last child of an aggr_kprobe */
    old_p = list_entry(p->list.next, struct kprobe, list);

    --
    Masami Hiramatsu

    Software Engineer
    Hitachi Computer Products (America) Inc.
    Software Solutions Division

    e-mail: mhiramat@redhat.com



    \
     
     \ /
      Last update: 2008-03-17 21:57    [W:0.038 / U:30.872 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site