lkml.org 
[lkml]   [2011]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[36/70] mm/thp: use conventional format for boolean attributes
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

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

    From: Ben Hutchings <ben@decadent.org.uk>

    commit e27e6151b154ff6e5e8162efa291bc60196d29ea upstream.

    The conventional format for boolean attributes in sysfs is numeric ("0" or
    "1" followed by new-line). Any boolean attribute can then be read and
    written using a generic function. Using the strings "yes [no]", "[yes]
    no" (read), "yes" and "no" (write) will frustrate this.

    [akpm@linux-foundation.org: use kstrtoul()]
    [akpm@linux-foundation.org: test_bit() doesn't return 1/0, per Neil]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: Mel Gorman <mel@csn.ul.ie>
    Cc: Johannes Weiner <jweiner@redhat.com>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Hugh Dickins <hughd@google.com>
    Tested-by: David Rientjes <rientjes@google.com>
    Cc: NeilBrown <neilb@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    mm/huge_memory.c | 24 ++++++++++++++----------
    1 file changed, 14 insertions(+), 10 deletions(-)

    --- a/mm/huge_memory.c
    +++ b/mm/huge_memory.c
    @@ -244,24 +244,28 @@ static ssize_t single_flag_show(struct k
    struct kobj_attribute *attr, char *buf,
    enum transparent_hugepage_flag flag)
    {
    - if (test_bit(flag, &transparent_hugepage_flags))
    - return sprintf(buf, "[yes] no\n");
    - else
    - return sprintf(buf, "yes [no]\n");
    + return sprintf(buf, "%d\n",
    + !!test_bit(flag, &transparent_hugepage_flags));
    }
    +
    static ssize_t single_flag_store(struct kobject *kobj,
    struct kobj_attribute *attr,
    const char *buf, size_t count,
    enum transparent_hugepage_flag flag)
    {
    - if (!memcmp("yes", buf,
    - min(sizeof("yes")-1, count))) {
    + unsigned long value;
    + int ret;
    +
    + ret = kstrtoul(buf, 10, &value);
    + if (ret < 0)
    + return ret;
    + if (value > 1)
    + return -EINVAL;
    +
    + if (value)
    set_bit(flag, &transparent_hugepage_flags);
    - } else if (!memcmp("no", buf,
    - min(sizeof("no")-1, count))) {
    + else
    clear_bit(flag, &transparent_hugepage_flags);
    - } else
    - return -EINVAL;

    return count;
    }



    \
     
     \ /
      Last update: 2011-04-19 22:27    [W:0.048 / U:91.704 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site