lkml.org 
[lkml]   [2009]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:bkl/drivers] nvram: Drop the bkl from non-generic nvram_llseek()
    Commit-ID:  9e8ab74ddaa591575f599248080a1f0d917a56ee
    Gitweb: http://git.kernel.org/tip/9e8ab74ddaa591575f599248080a1f0d917a56ee
    Author: Frederic Weisbecker <fweisbec@gmail.com>
    AuthorDate: Fri, 9 Oct 2009 21:27:06 +0200
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 14 Oct 2009 17:36:50 +0200

    nvram: Drop the bkl from non-generic nvram_llseek()

    Drop the bkl from nvram_llseek() as it obviously protects nothing.
    The file offset is safe in essence.

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    LKML-Reference: <1255116426-7270-1-git-send-email-fweisbec@gmail.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    drivers/char/nvram.c | 4 +---
    1 files changed, 1 insertions(+), 3 deletions(-)

    diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
    index 88cee40..2100a8f 100644
    --- a/drivers/char/nvram.c
    +++ b/drivers/char/nvram.c
    @@ -38,7 +38,6 @@
    #define NVRAM_VERSION "1.3"

    #include <linux/module.h>
    -#include <linux/smp_lock.h>
    #include <linux/nvram.h>

    #define PC 1
    @@ -214,7 +213,6 @@ void nvram_set_checksum(void)

    static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
    {
    - lock_kernel();
    switch (origin) {
    case 0:
    /* nothing to do */
    @@ -226,7 +224,7 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
    offset += NVRAM_BYTES;
    break;
    }
    - unlock_kernel();
    +
    return (offset >= 0) ? (file->f_pos = offset) : -EINVAL;
    }


    \
     
     \ /
      Last update: 2009-10-14 18:15    [W:0.021 / U:60.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site