hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  Revert "configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item()"
This commit is contained in:
Linus Torvalds 2009-02-05 16:12:38 -08:00
parent 09cd5b8f9d 436443f0f7
commit 082256333f
1 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
fs/configfs/dir.c
View File

@ -553,24 +553,12 @@ static void detach_groups(struct config_group *group)
child = sd->s_dentry; child = sd->s_dentry;
/*
* Note: we hide this from lockdep since we have no way
* to teach lockdep about recursive
* I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path
* in an inode tree, which are valid as soon as
* I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a
* parent inode to one of its children.
*/
lockdep_off();
mutex_lock(&child->d_inode->i_mutex); mutex_lock(&child->d_inode->i_mutex);
lockdep_on();
configfs_detach_group(sd->s_element); configfs_detach_group(sd->s_element);
child->d_inode->i_flags |= S_DEAD; child->d_inode->i_flags |= S_DEAD;
lockdep_off();
mutex_unlock(&child->d_inode->i_mutex); mutex_unlock(&child->d_inode->i_mutex);
lockdep_on();
d_delete(child); d_delete(child);
dput(child); dput(child);
@ -760,22 +748,11 @@ static int configfs_attach_item(struct config_item *parent_item,
* We are going to remove an inode and its dentry but * We are going to remove an inode and its dentry but
* the VFS may already have hit and used them. Thus, * the VFS may already have hit and used them. Thus,
* we must lock them as rmdir() would. * we must lock them as rmdir() would.
*
* Note: we hide this from lockdep since we have no way
* to teach lockdep about recursive
* I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path
* in an inode tree, which are valid as soon as
* I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a
* parent inode to one of its children.
*/ */
lockdep_off();
mutex_lock(&dentry->d_inode->i_mutex); mutex_lock(&dentry->d_inode->i_mutex);
lockdep_on();
configfs_remove_dir(item); configfs_remove_dir(item);
dentry->d_inode->i_flags |= S_DEAD; dentry->d_inode->i_flags |= S_DEAD;
lockdep_off();
mutex_unlock(&dentry->d_inode->i_mutex); mutex_unlock(&dentry->d_inode->i_mutex);
lockdep_on();
d_delete(dentry); d_delete(dentry);
} }
} }
@ -810,25 +787,14 @@ static int configfs_attach_group(struct config_item *parent_item,
* *
* We must also lock the inode to remove it safely in case of * We must also lock the inode to remove it safely in case of
* error, as rmdir() would. * error, as rmdir() would.
*
* Note: we hide this from lockdep since we have no way
* to teach lockdep about recursive
* I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path
* in an inode tree, which are valid as soon as
* I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a
* parent inode to one of its children.
*/ */
lockdep_off();
mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD); mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);
lockdep_on();
ret = populate_groups(to_config_group(item)); ret = populate_groups(to_config_group(item));
if (ret) { if (ret) {
configfs_detach_item(item); configfs_detach_item(item);
dentry->d_inode->i_flags |= S_DEAD; dentry->d_inode->i_flags |= S_DEAD;
} }
lockdep_off();
mutex_unlock(&dentry->d_inode->i_mutex); mutex_unlock(&dentry->d_inode->i_mutex);
lockdep_on();
if (ret) if (ret)
d_delete(dentry); d_delete(dentry);
} }
@ -990,17 +956,7 @@ static int configfs_depend_prep(struct dentry *origin,
BUG_ON(!origin || !sd); BUG_ON(!origin || !sd);
/* Lock this guy on the way down */ /* Lock this guy on the way down */
/*
* Note: we hide this from lockdep since we have no way
* to teach lockdep about recursive
* I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path
* in an inode tree, which are valid as soon as
* I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a
* parent inode to one of its children.
*/
lockdep_off();
mutex_lock(&sd->s_dentry->d_inode->i_mutex); mutex_lock(&sd->s_dentry->d_inode->i_mutex);
lockdep_on();
if (sd->s_element == target) /* Boo-yah */ if (sd->s_element == target) /* Boo-yah */
goto out; goto out;
@ -1014,9 +970,7 @@ static int configfs_depend_prep(struct dentry *origin,
} }
/* We looped all our children and didn't find target */ /* We looped all our children and didn't find target */
lockdep_off();
mutex_unlock(&sd->s_dentry->d_inode->i_mutex); mutex_unlock(&sd->s_dentry->d_inode->i_mutex);
lockdep_on();
ret = -ENOENT; ret = -ENOENT;
out: out:
@ -1036,16 +990,11 @@ static void configfs_depend_rollback(struct dentry *origin,
struct dentry *dentry = item->ci_dentry; struct dentry *dentry = item->ci_dentry;
while (dentry != origin) { while (dentry != origin) {
/* See comments in configfs_depend_prep() */
lockdep_off();
mutex_unlock(&dentry->d_inode->i_mutex); mutex_unlock(&dentry->d_inode->i_mutex);
lockdep_on();
dentry = dentry->d_parent; dentry = dentry->d_parent;
} }
lockdep_off();
mutex_unlock(&origin->d_inode->i_mutex); mutex_unlock(&origin->d_inode->i_mutex);
lockdep_on();
} }
int configfs_depend_item(struct configfs_subsystem *subsys, int configfs_depend_item(struct configfs_subsystem *subsys,
@ -1380,16 +1329,8 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry)
} }
/* Wait until the racing operation terminates */ /* Wait until the racing operation terminates */
/*
* Note: we hide this from lockdep since we are locked
* with subclass I_MUTEX_NORMAL from vfs_rmdir() (why
* not I_MUTEX_CHILD?), and I_MUTEX_XATTR or
* I_MUTEX_QUOTA are not relevant for the locked inode.
*/
lockdep_off();
mutex_lock(wait_mutex); mutex_lock(wait_mutex);
mutex_unlock(wait_mutex); mutex_unlock(wait_mutex);
lockdep_on();
} }
} while (ret == -EAGAIN); } while (ret == -EAGAIN);