*/
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;
}
/**
- * sysfs_new_inode - allocate new inode for sysfs_dirent
+ * sysfs_get_inode - get inode for sysfs_dirent
* @sd: sysfs_dirent to allocate inode for
*
- * Allocate inode for @sd and initialize basics.
+ * Get inode for @sd. If such inode doesn't exist, a new inode
+ * is allocated and basics are initialized. New inode is
+ * returned locked.
*
* LOCKING:
* Kernel thread context (may sleep).
* RETURNS:
* Pointer to allocated inode on success, NULL on failure.
*/
-struct inode * sysfs_new_inode(struct sysfs_dirent *sd)
+struct inode * sysfs_get_inode(struct sysfs_dirent *sd)
{
struct inode *inode;
- inode = new_inode(sysfs_sb);
- if (inode)
+ inode = iget_locked(sysfs_sb, sd->s_ino);
+ if (inode && (inode->i_state & I_NEW))
sysfs_init_inode(sd, inode);
return inode;
* @dentry: dentry to be instantiated
* @inode: inode associated with @sd
*
- * Instantiate @dentry with @inode.
+ * Unlock @inode if locked and instantiate @dentry with @inode.
*
* LOCKING:
* None.
{
BUG_ON(!dentry || dentry->d_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;
- }
+ if (inode->i_state & I_NEW)
+ unlock_new_inode(inode);
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)
+int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)
{
- struct dentry *dentry = NULL, *parent = NULL;
- struct inode *dir;
- struct timespec curtime;
-
- /* 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);
-
- if (sd->s_dentry && sd->s_dentry->d_inode) {
- /* get dentry if it's there and dput() didn't kill it yet */
- dentry = dget_locked(sd->s_dentry);
- parent = dentry->d_parent;
- } else if (sd->s_parent->s_dentry->d_inode) {
- /* We need to update the parent even if dentry for the
- * victim itself doesn't exist.
- */
- parent = dget_locked(sd->s_parent->s_dentry);
- }
-
- /* drop */
- if (dentry) {
- spin_lock(&dentry->d_lock);
- __d_drop(dentry);
- spin_unlock(&dentry->d_lock);
- }
-
- spin_unlock(&dcache_lock);
- spin_unlock(&sysfs_lock);
-
- /* nothing to do if the parent isn't in dcache */
- if (!parent)
- return;
-
- /* adjust nlink and update timestamp */
- dir = parent->d_inode;
- mutex_lock(&dir->i_mutex);
-
- curtime = CURRENT_TIME;
-
- dir->i_ctime = dir->i_mtime = curtime;
+ struct sysfs_addrm_cxt acxt;
+ struct sysfs_dirent **pos, *sd;
- if (dentry) {
- dentry->d_inode->i_ctime = curtime;
- drop_nlink(dentry->d_inode);
- if (sd->s_type & SYSFS_DIR) {
- drop_nlink(dentry->d_inode);
- drop_nlink(dir);
- /* XXX: unpin if directory, this will go away soon */
- dput(dentry);
- }
- }
-
- mutex_unlock(&dir->i_mutex);
-
- /* bye bye */
- if (dentry)
- dput(dentry);
- else
- dput(parent);
-}
-
-int sysfs_hash_and_remove(struct dentry * dir, const char * name)
-{
- struct sysfs_dirent * 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);
+
+ for (pos = &dir_sd->s_children; *pos; pos = &(*pos)->s_sibling) {
+ sd = *pos;
- parent_sd = dir->d_fsdata;
- mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
- list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
- if (!sd->s_type)
+ if (!sysfs_type(sd))
continue;
if (!strcmp(sd->s_name, name)) {
- list_del_init(&sd->s_sibling);
- found = 1;
+ *pos = sd->s_sibling;
+ sd->s_sibling = NULL;
+ 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;
}