summaryrefslogtreecommitdiff
path: root/fs/autofs4
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-01-16 18:29:35 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-18 01:21:28 -0500
commit5a37db302e698a83209eff22ca8f3fd05eb1d84b (patch)
tree0ffef4412676c8b1814a2965b150168fcb9cfb03 /fs/autofs4
parent726a5e0688fd344110d8f2979d87f243a4ba1a48 (diff)
downloadlinux-3.10-5a37db302e698a83209eff22ca8f3fd05eb1d84b.tar.gz
linux-3.10-5a37db302e698a83209eff22ca8f3fd05eb1d84b.tar.bz2
linux-3.10-5a37db302e698a83209eff22ca8f3fd05eb1d84b.zip
autofs4: mkdir and symlink always get a dentry that had passed lookup
... so ->d_fsdata will have been set up before we get there Acked-by: Ian Kent <raven@themaw.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4')
-rw-r--r--fs/autofs4/root.c28
1 files changed, 10 insertions, 18 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 83e5379c5ad..a5b93e8f49b 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -539,18 +539,15 @@ static int autofs4_dir_symlink(struct inode *dir,
if (!autofs4_oz_mode(sbi))
return -EACCES;
- ino = autofs4_init_ino(ino, sbi);
- if (!ino)
- return -ENOMEM;
+ BUG_ON(!ino);
+
+ autofs4_init_ino(ino, sbi);
autofs4_del_active(dentry);
cp = kmalloc(size + 1, GFP_KERNEL);
- if (!cp) {
- if (!dentry->d_fsdata)
- kfree(ino);
+ if (!cp)
return -ENOMEM;
- }
strcpy(cp, symname);
@@ -565,8 +562,7 @@ static int autofs4_dir_symlink(struct inode *dir,
inode->i_size = size;
d_add(dentry, inode);
- dentry->d_fsdata = ino;
- ino->dentry = dget(dentry);
+ dget(dentry);
atomic_inc(&ino->count);
p_ino = autofs4_dentry_ino(dentry->d_parent);
if (p_ino && dentry->d_parent != dentry)
@@ -734,25 +730,21 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
DPRINTK("dentry %p, creating %.*s",
dentry, dentry->d_name.len, dentry->d_name.name);
- ino = autofs4_init_ino(ino, sbi);
- if (!ino)
- return -ENOMEM;
+ BUG_ON(!ino);
+
+ autofs4_init_ino(ino, sbi);
autofs4_del_active(dentry);
inode = autofs4_get_inode(dir->i_sb, S_IFDIR | 0555);
- if (!inode) {
- if (!dentry->d_fsdata)
- kfree(ino);
+ if (!inode)
return -ENOMEM;
- }
d_add(dentry, inode);
if (sbi->version < 5)
autofs_set_leaf_automount_flags(dentry);
- dentry->d_fsdata = ino;
- ino->dentry = dget(dentry);
+ dget(dentry);
atomic_inc(&ino->count);
p_ino = autofs4_dentry_ino(dentry->d_parent);
if (p_ino && dentry->d_parent != dentry)