mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 10:09:10 +02:00
configfs_depend_prep(): pass configfs_dirent instead of dentry
Again, the only thing it uses dentry for is dentry->d_fsdata; for the recursive call the situation is the same as with configfs_detach_prep() and the same observation about ->s_dentry->d_fsdata applies. Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Breno Leitao <leitao@debian.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
96551d7f9f
commit
764682e011
|
|
@ -1093,15 +1093,12 @@ static int configfs_dump(struct configfs_dirent *sd, int level)
|
|||
* much on the stack, though, so folks that need this function - be careful
|
||||
* about your stack! Patches will be accepted to make it iterative.
|
||||
*/
|
||||
static int configfs_depend_prep(struct dentry *origin,
|
||||
static int configfs_depend_prep(struct configfs_dirent *sd,
|
||||
struct config_item *target)
|
||||
{
|
||||
struct configfs_dirent *child_sd, *sd;
|
||||
struct configfs_dirent *child_sd;
|
||||
int ret = 0;
|
||||
|
||||
BUG_ON(!origin || !origin->d_fsdata);
|
||||
sd = origin->d_fsdata;
|
||||
|
||||
if (sd->s_element == target) /* Boo-yah */
|
||||
goto out;
|
||||
|
||||
|
|
@ -1109,8 +1106,7 @@ static int configfs_depend_prep(struct dentry *origin,
|
|||
if ((child_sd->s_type & CONFIGFS_DIR) &&
|
||||
!(child_sd->s_type & CONFIGFS_USET_DROPPING) &&
|
||||
!(child_sd->s_type & CONFIGFS_USET_CREATING)) {
|
||||
ret = configfs_depend_prep(child_sd->s_dentry,
|
||||
target);
|
||||
ret = configfs_depend_prep(child_sd, target);
|
||||
if (!ret)
|
||||
goto out; /* Child path boo-yah */
|
||||
}
|
||||
|
|
@ -1131,7 +1127,7 @@ static int configfs_do_depend_item(struct dentry *subsys_dentry,
|
|||
|
||||
spin_lock(&configfs_dirent_lock);
|
||||
/* Scan the tree, return 0 if found */
|
||||
ret = configfs_depend_prep(subsys_dentry, target);
|
||||
ret = configfs_depend_prep(subsys_dentry->d_fsdata, target);
|
||||
if (ret)
|
||||
goto out_unlock_dirent_lock;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user