lkml.org 
[lkml]   [2007]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/75] sysfs/file.c - use mutex instead of semaphore
    Date
    From: Dave Young <hidave.darkstar@gmail.com>

    Use mutex instead of semaphore in sysfs/file.c : sys_buffer.

    Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/sysfs/file.c | 14 +++++++-------
    1 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
    index 3e1cc06..b21d11b 100644
    --- a/fs/sysfs/file.c
    +++ b/fs/sysfs/file.c
    @@ -8,8 +8,8 @@
    #include <linux/namei.h>
    #include <linux/poll.h>
    #include <linux/list.h>
    +#include <linux/mutex.h>
    #include <asm/uaccess.h>
    -#include <asm/semaphore.h>

    #include "sysfs.h"

    @@ -55,7 +55,7 @@ struct sysfs_buffer {
    loff_t pos;
    char * page;
    struct sysfs_ops * ops;
    - struct semaphore sem;
    + struct mutex mutex;
    int needs_read_fill;
    int event;
    };
    @@ -128,7 +128,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)
    struct sysfs_buffer * buffer = file->private_data;
    ssize_t retval = 0;

    - down(&buffer->sem);
    + mutex_lock(&buffer->mutex);
    if (buffer->needs_read_fill) {
    retval = fill_read_buffer(file->f_path.dentry,buffer);
    if (retval)
    @@ -139,7 +139,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)
    retval = simple_read_from_buffer(buf, count, ppos, buffer->page,
    buffer->count);
    out:
    - up(&buffer->sem);
    + mutex_unlock(&buffer->mutex);
    return retval;
    }

    @@ -228,13 +228,13 @@ sysfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t
    struct sysfs_buffer * buffer = file->private_data;
    ssize_t len;

    - down(&buffer->sem);
    + mutex_lock(&buffer->mutex);
    len = fill_write_buffer(buffer, buf, count);
    if (len > 0)
    len = flush_write_buffer(file->f_path.dentry, buffer, len);
    if (len > 0)
    *ppos += len;
    - up(&buffer->sem);
    + mutex_unlock(&buffer->mutex);
    return len;
    }

    @@ -294,7 +294,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
    if (!buffer)
    goto err_out;

    - init_MUTEX(&buffer->sem);
    + mutex_init(&buffer->mutex);
    buffer->needs_read_fill = 1;
    buffer->ops = ops;
    file->private_data = buffer;
    --
    1.5.3.4
    -
    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-10-13 00:31    [W:4.084 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site