git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
fs
/
configfs
/
inode.c
diff --git
a/fs/configfs/inode.c
b/fs/configfs/inode.c
index
253476d
..
c83f476
100644
(file)
--- a/
fs/configfs/inode.c
+++ b/
fs/configfs/inode.c
@@
-250,18
+250,14
@@
void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent)
struct dentry * dentry = sd->s_dentry;
if (dentry) {
struct dentry * dentry = sd->s_dentry;
if (dentry) {
- spin_lock(&dcache_lock);
spin_lock(&dentry->d_lock);
if (!(d_unhashed(dentry) && dentry->d_inode)) {
spin_lock(&dentry->d_lock);
if (!(d_unhashed(dentry) && dentry->d_inode)) {
- dget_
locked
(dentry);
+ dget_
dlock
(dentry);
__d_drop(dentry);
spin_unlock(&dentry->d_lock);
__d_drop(dentry);
spin_unlock(&dentry->d_lock);
- spin_unlock(&dcache_lock);
simple_unlink(parent->d_inode, dentry);
simple_unlink(parent->d_inode, dentry);
- } else
{
+ } else
spin_unlock(&dentry->d_lock);
spin_unlock(&dentry->d_lock);
- spin_unlock(&dcache_lock);
- }
}
}
}
}