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>
#include <linux/namei.h>
#include <linux/poll.h>
#include <linux/list.h>
#include <linux/namei.h>
#include <linux/poll.h>
#include <linux/list.h>
+#include <linux/mutex.h>
-#include <asm/semaphore.h>
loff_t pos;
char * page;
struct sysfs_ops * ops;
loff_t pos;
char * page;
struct sysfs_ops * ops;
int needs_read_fill;
int event;
};
int needs_read_fill;
int event;
};
struct sysfs_buffer * buffer = file->private_data;
ssize_t retval = 0;
struct sysfs_buffer * buffer = file->private_data;
ssize_t retval = 0;
+ mutex_lock(&buffer->mutex);
if (buffer->needs_read_fill) {
retval = fill_read_buffer(file->f_path.dentry,buffer);
if (retval)
if (buffer->needs_read_fill) {
retval = fill_read_buffer(file->f_path.dentry,buffer);
if (retval)
retval = simple_read_from_buffer(buf, count, ppos, buffer->page,
buffer->count);
out:
retval = simple_read_from_buffer(buf, count, ppos, buffer->page,
buffer->count);
out:
+ mutex_unlock(&buffer->mutex);
struct sysfs_buffer * buffer = file->private_data;
ssize_t len;
struct sysfs_buffer * buffer = file->private_data;
ssize_t len;
+ 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;
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;
+ mutex_unlock(&buffer->mutex);
if (!buffer)
goto err_out;
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;
buffer->needs_read_fill = 1;
buffer->ops = ops;
file->private_data = buffer;