leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: factor out lookup_mountpoint from new_mountpoint

Browse Source 
I am shortly going to add a new user of struct mountpoint that
needs to look up existing entries but does not want to create
a struct mountpoint if one does not exist.  Therefore to keep
the code simple and easy to read split out lookup_mountpoint
from new_mountpoint.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Eric W. Biederman 2014-02-24 17:32:34 -08:00 committed by Al Viro
parent 0a5eb7c818
commit e2dfa93546
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/namespace.c
View File

@ -703,11 +703,10 @@ out:
return is_covered; return is_covered;
} }
static struct mountpoint *new_mountpoint(struct dentry *dentry) static struct mountpoint *lookup_mountpoint(struct dentry *dentry)
{ {
struct hlist_head *chain = mp_hash(dentry); struct hlist_head *chain = mp_hash(dentry);
struct mountpoint *mp; struct mountpoint *mp;
int ret;
hlist_for_each_entry(mp, chain, m_hash) { hlist_for_each_entry(mp, chain, m_hash) {
if (mp->m_dentry == dentry) { if (mp->m_dentry == dentry) {
@ -718,6 +717,14 @@ static struct mountpoint *new_mountpoint(struct dentry *dentry)
return mp; return mp;
} }
} }
return NULL;
}
static struct mountpoint *new_mountpoint(struct dentry *dentry)
{
struct hlist_head *chain = mp_hash(dentry);
struct mountpoint *mp;
int ret;
mp = kmalloc(sizeof(struct mountpoint), GFP_KERNEL); mp = kmalloc(sizeof(struct mountpoint), GFP_KERNEL);
if (!mp) if (!mp)
@ -1818,7 +1825,9 @@ retry:
namespace_lock(); namespace_lock();
mnt = lookup_mnt(path); mnt = lookup_mnt(path);
if (likely(!mnt)) { if (likely(!mnt)) {
struct mountpoint *mp = new_mountpoint(dentry); struct mountpoint *mp = lookup_mountpoint(dentry);
if (!mp)
mp = new_mountpoint(dentry);
if (IS_ERR(mp)) { if (IS_ERR(mp)) {
namespace_unlock(); namespace_unlock();
mutex_unlock(&dentry->d_inode->i_mutex); mutex_unlock(&dentry->d_inode->i_mutex);