Pull asus into release branch

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

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index ee3a5d957051a33221c1c3a61f432d40b0a5dd4e..10d1b52899f111a880ae858b3c9ef7833f915890 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -133,7 +133,7 @@ static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
  */
 static struct lock_class_key sysfs_inode_imutex_key;
 
-void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
+static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
 {
        inode->i_blocks = 0;
        inode->i_mapping->a_ops = &sysfs_aops;
@@ -191,106 +191,23 @@ void sysfs_instantiate(struct dentry *dentry, struct inode *inode)
 {
        BUG_ON(!dentry || dentry->d_inode);
 
-       if (inode->i_state & I_NEW) {
+       if (inode->i_state & I_NEW)
                unlock_new_inode(inode);
 
-               if (dentry->d_parent && dentry->d_parent->d_inode) {
-                       struct inode *p_inode = dentry->d_parent->d_inode;
-                       p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
-               }
-       }
-
        d_instantiate(dentry, inode);
 }
 
-/**
- *     sysfs_drop_dentry - drop dentry for the specified sysfs_dirent
- *     @sd: target sysfs_dirent
- *
- *     Drop dentry for @sd.  @sd must have been unlinked from its
- *     parent on entry to this function such that it can't be looked
- *     up anymore.
- *
- *     @sd->s_dentry which is protected with sysfs_lock points to the
- *     currently associated dentry but we're not holding a reference
- *     to it and racing with dput().  Grab dcache_lock and verify
- *     dentry before dropping it.  If @sd->s_dentry is NULL or dput()
- *     beats us, no need to bother.
- */
-void sysfs_drop_dentry(struct sysfs_dirent *sd)
-{
-       struct dentry *dentry = NULL;
-       struct timespec curtime;
-       struct inode *inode;
-
-       /* We're not holding a reference to ->s_dentry dentry but the
-        * field will stay valid as long as sysfs_lock is held.
-        */
-       spin_lock(&sysfs_lock);
-       spin_lock(&dcache_lock);
-
-       /* drop dentry if it's there and dput() didn't kill it yet */
-       if (sd->s_dentry && sd->s_dentry->d_inode) {
-               dentry = dget_locked(sd->s_dentry);
-               spin_lock(&dentry->d_lock);
-               __d_drop(dentry);
-               spin_unlock(&dentry->d_lock);
-       }
-
-       spin_unlock(&dcache_lock);
-       spin_unlock(&sysfs_lock);
-
-       dput(dentry);
-       /* XXX: unpin if directory, this will go away soon */
-       if (sysfs_type(sd) == SYSFS_DIR)
-               dput(dentry);
-
-       /* adjust nlink and update timestamp */
-       curtime = CURRENT_TIME;
-
-       inode = ilookup(sysfs_sb, sd->s_ino);
-       if (inode) {
-               mutex_lock(&inode->i_mutex);
-
-               inode->i_ctime = curtime;
-               drop_nlink(inode);
-               if (sysfs_type(sd) == SYSFS_DIR)
-                       drop_nlink(inode);
-
-               mutex_unlock(&inode->i_mutex);
-               iput(inode);
-       }
-
-       /* adjust nlink and udpate timestamp of the parent */
-       inode = ilookup(sysfs_sb, sd->s_parent->s_ino);
-       if (inode) {
-               mutex_lock(&inode->i_mutex);
-
-               inode->i_ctime = inode->i_mtime = curtime;
-               if (sysfs_type(sd) == SYSFS_DIR)
-                       drop_nlink(inode);
-
-               mutex_unlock(&inode->i_mutex);
-               iput(inode);
-       }
-}
-
-int sysfs_hash_and_remove(struct dentry * dir, const char * name)
+int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)
 {
+       struct sysfs_addrm_cxt acxt;
        struct sysfs_dirent **pos, *sd;
-       struct sysfs_dirent *parent_sd;
-       int found = 0;
 
-       if (!dir)
+       if (!dir_sd)
                return -ENOENT;
 
-       if (dir->d_inode == NULL)
-               /* no inode means this hasn't been made visible yet */
-               return -ENOENT;
+       sysfs_addrm_start(&acxt, dir_sd);
 
-       parent_sd = dir->d_fsdata;
-       mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
-       for (pos = &parent_sd->s_children; *pos; pos = &(*pos)->s_sibling) {
+       for (pos = &dir_sd->s_children; *pos; pos = &(*pos)->s_sibling) {
                sd = *pos;
 
                if (!sysfs_type(sd))
@@ -298,18 +215,12 @@ int sysfs_hash_and_remove(struct dentry * dir, const char * name)
                if (!strcmp(sd->s_name, name)) {
                        *pos = sd->s_sibling;
                        sd->s_sibling = NULL;
-                       found = 1;
+                       sysfs_remove_one(&acxt, sd);
                        break;
                }
        }
-       mutex_unlock(&dir->d_inode->i_mutex);
-
-       if (!found)
-               return -ENOENT;
-
-       sysfs_drop_dentry(sd);
-       sysfs_deactivate(sd);
-       sysfs_put(sd);
 
-       return 0;
+       if (sysfs_addrm_finish(&acxt))
+               return 0;
+       return -ENOENT;
 }