lkml.org 
[lkml]   [2009]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 2/5] macintosh: Remove BKL from nvram driver
    Drop the bkl from nvram_llseek() as it obviously protects nothing. The
    file offset is safe in essence.

    The ioctl can be converted to unlocked_ioctl because it just calls
    pmac_get_partition() which reads a value from an array which was
    initialized at early boot time. No need for serialization.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: linuxppc-dev@ozlabs.org
    ---
    drivers/macintosh/nvram.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    Index: linux-2.6-tip/drivers/macintosh/nvram.c
    ===================================================================
    --- linux-2.6-tip.orig/drivers/macintosh/nvram.c
    +++ linux-2.6-tip/drivers/macintosh/nvram.c
    @@ -13,7 +13,6 @@
    #include <linux/fcntl.h>
    #include <linux/nvram.h>
    #include <linux/init.h>
    -#include <linux/smp_lock.h>
    #include <asm/uaccess.h>
    #include <asm/nvram.h>

    @@ -21,7 +20,6 @@

    static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
    {
    - lock_kernel();
    switch (origin) {
    case 1:
    offset += file->f_pos;
    @@ -30,12 +28,10 @@ static loff_t nvram_llseek(struct file *
    offset += NVRAM_SIZE;
    break;
    }
    - if (offset < 0) {
    - unlock_kernel();
    + if (offset < 0)
    return -EINVAL;
    - }
    +
    file->f_pos = offset;
    - unlock_kernel();
    return file->f_pos;
    }

    @@ -76,8 +72,7 @@ static ssize_t write_nvram(struct file *
    return p - buf;
    }

    -static int nvram_ioctl(struct inode *inode, struct file *file,
    - unsigned int cmd, unsigned long arg)
    +static long nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
    {
    switch(cmd) {
    case PMAC_NVRAM_GET_OFFSET:



    \
     
     \ /
      Last update: 2009-10-15 22:43    [W:4.644 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site