summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index a830e1463704..4fb1691b4355 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1961,9 +1961,9 @@ static struct mountpoint *lock_mount(struct path *path)
1961 struct vfsmount *mnt; 1961 struct vfsmount *mnt;
1962 struct dentry *dentry = path->dentry; 1962 struct dentry *dentry = path->dentry;
1963retry: 1963retry:
1964 mutex_lock(&dentry->d_inode->i_mutex); 1964 inode_lock(dentry->d_inode);
1965 if (unlikely(cant_mount(dentry))) { 1965 if (unlikely(cant_mount(dentry))) {
1966 mutex_unlock(&dentry->d_inode->i_mutex); 1966 inode_unlock(dentry->d_inode);
1967 return ERR_PTR(-ENOENT); 1967 return ERR_PTR(-ENOENT);
1968 } 1968 }
1969 namespace_lock(); 1969 namespace_lock();
@@ -1974,13 +1974,13 @@ retry:
1974 mp = new_mountpoint(dentry); 1974 mp = new_mountpoint(dentry);
1975 if (IS_ERR(mp)) { 1975 if (IS_ERR(mp)) {
1976 namespace_unlock(); 1976 namespace_unlock();
1977 mutex_unlock(&dentry->d_inode->i_mutex); 1977 inode_unlock(dentry->d_inode);
1978 return mp; 1978 return mp;
1979 } 1979 }
1980 return mp; 1980 return mp;
1981 } 1981 }
1982 namespace_unlock(); 1982 namespace_unlock();
1983 mutex_unlock(&path->dentry->d_inode->i_mutex); 1983 inode_unlock(path->dentry->d_inode);
1984 path_put(path); 1984 path_put(path);
1985 path->mnt = mnt; 1985 path->mnt = mnt;
1986 dentry = path->dentry = dget(mnt->mnt_root); 1986 dentry = path->dentry = dget(mnt->mnt_root);
@@ -1992,7 +1992,7 @@ static void unlock_mount(struct mountpoint *where)
1992 struct dentry *dentry = where->m_dentry; 1992 struct dentry *dentry = where->m_dentry;
1993 put_mountpoint(where); 1993 put_mountpoint(where);
1994 namespace_unlock(); 1994 namespace_unlock();
1995 mutex_unlock(&dentry->d_inode->i_mutex); 1995 inode_unlock(dentry->d_inode);
1996} 1996}
1997 1997
1998static int graft_tree(struct mount *mnt, struct mount *p, struct mountpoint *mp) 1998static int graft_tree(struct mount *mnt, struct mount *p, struct mountpoint *mp)