Commit 9a8e1340 authored by Patrick Mochel's avatar Patrick Mochel

Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-driverfs
parents 13e895aa 22376789
...@@ -767,19 +767,19 @@ void driverfs_remove_dir(struct driver_dir_entry * dir) ...@@ -767,19 +767,19 @@ void driverfs_remove_dir(struct driver_dir_entry * dir)
down(&dentry->d_parent->d_inode->i_sem); down(&dentry->d_parent->d_inode->i_sem);
down(&dentry->d_inode->i_sem); down(&dentry->d_inode->i_sem);
node = dir->files.next; node = dentry->d_subdirs.next;
while (node != &dir->files) { while (node != &dentry->d_subdirs) {
struct driver_file_entry * entry; struct dentry * d = list_entry(node,struct dentry,d_child);
entry = list_entry(node,struct driver_file_entry,node); struct driver_file_entry * entry = d->d_fsdata;
list_del_init(node); node = node->next;
driverfs_unlink(dentry->d_inode,entry->dentry);
dput(entry->dentry); list_del_init(&entry->node);
driverfs_unlink(dentry->d_inode,d);
dput(dentry);
put_mount(); put_mount();
node = dir->files.next;
} }
up(&dentry->d_inode->i_sem); up(&dentry->d_inode->i_sem);
driverfs_rmdir(dentry->d_parent->d_inode,dentry); driverfs_rmdir(dentry->d_parent->d_inode,dentry);
up(&dentry->d_parent->d_inode->i_sem); up(&dentry->d_parent->d_inode->i_sem);
dput(dentry); dput(dentry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment