sysfs: make sysfs_add_one() automatically check for duplicate entry

[cascardo/linux.git] / fs / sysfs / file.c

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 3e1cc06..33bb340 100644 (file)
--- 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;
@@ -397,6 +397,7 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
        umode_t mode = (attr->mode & S_IALLUGO) | S_IFREG;
        struct sysfs_addrm_cxt acxt;
        struct sysfs_dirent *sd;
+       int rc;
 
        sd = sysfs_new_dirent(attr->name, mode, type);
        if (!sd)
@@ -404,18 +405,13 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
        sd->s_elem.attr.attr = (void *)attr;
 
        sysfs_addrm_start(&acxt, dir_sd);
+       rc = sysfs_add_one(&acxt, sd);
+       sysfs_addrm_finish(&acxt);
 
-       if (!sysfs_find_dirent(dir_sd, attr->name)) {
-               sysfs_add_one(&acxt, sd);
-               sysfs_link_sibling(sd);
-       }
-
-       if (!sysfs_addrm_finish(&acxt)) {
+       if (rc)
                sysfs_put(sd);
-               return -EEXIST;
-       }
 
-       return 0;
+       return rc;
 }