projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'exynos-drm-fixes' of git://git.kernel.org:/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
fs
/
dcache.c
diff --git
a/fs/dcache.c
b/fs/dcache.c
index
b4539e8
..
92d5140
100644
(file)
--- a/
fs/dcache.c
+++ b/
fs/dcache.c
@@
-2462,7
+2462,7
@@
EXPORT_SYMBOL(d_rehash);
*/
void dentry_update_name_case(struct dentry *dentry, struct qstr *name)
{
*/
void dentry_update_name_case(struct dentry *dentry, struct qstr *name)
{
- BUG_ON(!
mutex_is_locked(&dentry->d_parent->d_inode->i_mutex
));
+ BUG_ON(!
inode_is_locked(dentry->d_parent->d_inode
));
BUG_ON(dentry->d_name.len != name->len); /* d_lookup gives this */
spin_lock(&dentry->d_lock);
BUG_ON(dentry->d_name.len != name->len); /* d_lookup gives this */
spin_lock(&dentry->d_lock);
@@
-2738,7
+2738,7
@@
static int __d_unalias(struct inode *inode,
if (!mutex_trylock(&dentry->d_sb->s_vfs_rename_mutex))
goto out_err;
m1 = &dentry->d_sb->s_vfs_rename_mutex;
if (!mutex_trylock(&dentry->d_sb->s_vfs_rename_mutex))
goto out_err;
m1 = &dentry->d_sb->s_vfs_rename_mutex;
- if (!
mutex_trylock(&alias->d_parent->d_inode->i_mutex
))
+ if (!
inode_trylock(alias->d_parent->d_inode
))
goto out_err;
m2 = &alias->d_parent->d_inode->i_mutex;
out_unalias:
goto out_err;
m2 = &alias->d_parent->d_inode->i_mutex;
out_unalias: