aboutsummaryrefslogtreecommitdiffstats
path: root/fs/autofs4/root.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-01-16 18:43:40 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-18 01:21:28 -0500
commit26e6c910670171410577c7df2aebe94cef76e150 (patch)
tree407ecb012b91efce80be76f0191b2efc43689b7f /fs/autofs4/root.c
parent5a37db302e698a83209eff22ca8f3fd05eb1d84b (diff)
autofs4: split autofs4_init_ino()
split init_ino into new_ino and clean_ino; the former is what used to be init_ino(NULL, sbi), the latter is for cases where we passed non-NULL ino. Lose unused arguments. Acked-by: Ian Kent <raven@themaw.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/root.c')
-rw-r--r--fs/autofs4/root.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index a5b93e8f49b5..f7c97c084c1f 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -508,7 +508,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
508 if (autofs_type_indirect(sbi->type) && IS_ROOT(dentry->d_parent)) 508 if (autofs_type_indirect(sbi->type) && IS_ROOT(dentry->d_parent))
509 __managed_dentry_set_managed(dentry); 509 __managed_dentry_set_managed(dentry);
510 510
511 ino = autofs4_init_ino(NULL, sbi); 511 ino = autofs4_new_ino(sbi);
512 if (!ino) 512 if (!ino)
513 return ERR_PTR(-ENOMEM); 513 return ERR_PTR(-ENOMEM);
514 514
@@ -541,7 +541,7 @@ static int autofs4_dir_symlink(struct inode *dir,
541 541
542 BUG_ON(!ino); 542 BUG_ON(!ino);
543 543
544 autofs4_init_ino(ino, sbi); 544 autofs4_clean_ino(ino);
545 545
546 autofs4_del_active(dentry); 546 autofs4_del_active(dentry);
547 547
@@ -732,7 +732,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode)
732 732
733 BUG_ON(!ino); 733 BUG_ON(!ino);
734 734
735 autofs4_init_ino(ino, sbi); 735 autofs4_clean_ino(ino);
736 736
737 autofs4_del_active(dentry); 737 autofs4_del_active(dentry);
738 738