vserver 1.9.5.x5

[linux-2.6.git] / fs / sysfs / inode.c

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index d0030a4..204d071 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -11,6 +11,8 @@
 #include <linux/pagemap.h>
 #include <linux/namei.h>
 #include <linux/backing-dev.h>
+#include "sysfs.h"
+
 extern struct super_block * sysfs_sb;
 
 static struct address_space_operations sysfs_aops = {
@@ -29,8 +31,8 @@ struct inode * sysfs_new_inode(mode_t mode)
        struct inode * inode = new_inode(sysfs_sb);
        if (inode) {
                inode->i_mode = mode;
-               inode->i_uid = current->fsuid;
-               inode->i_gid = current->fsgid;
+               inode->i_uid = 0;
+               inode->i_gid = 0;
                inode->i_blksize = PAGE_CACHE_SIZE;
                inode->i_blocks = 0;
                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -66,18 +68,14 @@ int sysfs_create(struct dentry * dentry, int mode, int (*init)(struct inode *))
                error = init(inode);
        if (!error) {
                d_instantiate(dentry, inode);
-               dget(dentry); /* Extra count - pin the dentry in core */
+               if (S_ISDIR(mode))
+                       dget(dentry);  /* pin only directory dentry in core */
        } else
                iput(inode);
  Done:
        return error;
 }
 
-int sysfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
-{
-       return sysfs_create(dentry, mode, NULL);
-}
-
 struct dentry * sysfs_get_dentry(struct dentry * parent, const char * name)
 {
        struct qstr qstr;
@@ -88,31 +86,74 @@ struct dentry * sysfs_get_dentry(struct dentry * parent, const char * name)
        return lookup_hash(&qstr,parent);
 }
 
+/*
+ * Get the name for corresponding element represented by the given sysfs_dirent
+ */
+const unsigned char * sysfs_get_name(struct sysfs_dirent *sd)
+{
+       struct attribute * attr;
+       struct bin_attribute * bin_attr;
+       struct sysfs_symlink  * sl;
+
+       if (!sd || !sd->s_element)
+               BUG();
+
+       switch (sd->s_type) {
+               case SYSFS_DIR:
+                       /* Always have a dentry so use that */
+                       return sd->s_dentry->d_name.name;
+
+               case SYSFS_KOBJ_ATTR:
+                       attr = sd->s_element;
+                       return attr->name;
+
+               case SYSFS_KOBJ_BIN_ATTR:
+                       bin_attr = sd->s_element;
+                       return bin_attr->attr.name;
+
+               case SYSFS_KOBJ_LINK:
+                       sl = sd->s_element;
+                       return sl->link_name;
+       }
+       return NULL;
+}
+
+
+/*
+ * Unhashes the dentry corresponding to given sysfs_dirent
+ * Called with parent inode's i_sem held.
+ */
+void sysfs_drop_dentry(struct sysfs_dirent * sd, struct dentry * parent)
+{
+       struct dentry * dentry = sd->s_dentry;
+
+       if (dentry) {
+               spin_lock(&dcache_lock);
+               if (!(d_unhashed(dentry) && dentry->d_inode)) {
+                       dget_locked(dentry);
+                       __d_drop(dentry);
+                       spin_unlock(&dcache_lock);
+                       simple_unlink(parent->d_inode, dentry);
+               } else
+                       spin_unlock(&dcache_lock);
+       }
+}
+
 void sysfs_hash_and_remove(struct dentry * dir, const char * name)
 {
-       struct dentry * victim;
+       struct sysfs_dirent * sd;
+       struct sysfs_dirent * parent_sd = dir->d_fsdata;
 
        down(&dir->d_inode->i_sem);
-       victim = sysfs_get_dentry(dir,name);
-       if (!IS_ERR(victim)) {
-               /* make sure dentry is really there */
-               if (victim->d_inode && 
-                   (victim->d_parent->d_inode == dir->d_inode)) {
-                       pr_debug("sysfs: Removing %s (%d)\n", victim->d_name.name,
-                                atomic_read(&victim->d_count));
-
-                       d_drop(victim);
-                       /* release the target kobject in case of 
-                        * a symlink
-                        */
-                       if (S_ISLNK(victim->d_inode->i_mode))
-                               kobject_put(victim->d_fsdata);
-                       simple_unlink(dir->d_inode,victim);
+       list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
+               if (!sd->s_element)
+                       continue;
+               if (!strcmp(sysfs_get_name(sd), name)) {
+                       list_del_init(&sd->s_sibling);
+                       sysfs_drop_dentry(sd, dir);
+                       sysfs_put(sd);
+                       break;
                }
-               /*
-                * Drop reference from sysfs_get_dentry() above.
-                */
-               dput(victim);
        }
        up(&dir->d_inode->i_sem);
 }