A couple of maintenance fixes for autofs
Subsystems (2)
Ian Kent
maintainercover A couple of maintenance fixes for autofs
Hi Andrew,
Here are a couple of fixes for autofs.
The first patch fixes a couple of potential incorrect error returns from autofs4_fill_super() so it's probably worthwhile to mege this sooner rather than later.
The later is purely an improvement to using the IS_ROOT() macro.
---
Rui Xiang (2):
autofs: fix the return value of autofs4_fill_super
autofs: use IS_ROOT to replace root dentry checks
fs/autofs4/inode.c | 13 ++++++++----- fs/autofs4/root.c | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-)
Signature · 1 line
Ian
Ian Kent
maintainerPATCH 1/2 autofs: fix the return value of autofs4_fill_super
From: Rui Xiang <[email protected]>
While kzallocing sbi/ino fails, it should return -ENOMEM.
And it should return the err value from autofs_prepare_pipe.
--- fs/autofs4/inode.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/autofs4/inode.c +8 -5
@@ -206,10 +206,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)int pipefd;struct autofs_sb_info *sbi;struct autofs_info *ino; +int ret = -EINVAL ; sbi =kzalloc (sizeof (*sbi),GFP_KERNEL );if (!sbi) - goto fail_unlock; +return -ENOMEM ;DPRINTK ("starting up, sbi = %p" ,sbi); s->s_fs_info = sbi;
@@ -243,8 +244,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)* Get the root inode and dentry, but defer checking for errors. */ ino =autofs4_new_ino (sbi); -if (!ino) +if (!ino) { + ret = -ENOMEM ; goto fail_free; + } root_inode =autofs4_get_inode (s,S_IFDIR |0755 ); root =d_make_root (root_inode);if (!root)
@@ -291,7 +294,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)printk ("autofs: could not open pipe file descriptor\n" ); goto fail_dput; } -if (autofs_prepare_pipe (pipe) <0 ) + ret =autofs_prepare_pipe (pipe); +if (ret <0 ) goto fail_fput; sbi->pipe = pipe; sbi->pipefd = pipefd;
@@ -318,8 +322,7 @@ fail_ino: fail_free:kfree (sbi); s->s_fs_info =NULL ; -fail_unlock: -return -EINVAL ; +return ret; }struct inode *autofs4_get_inode (struct super_block *sb,umode_t mode)
Ian Kent
maintainerPATCH 2/2 autofs: use IS_ROOT to replace root dentry checks
In reply to Ian KentFrom: Rui Xiang <[email protected]>
Use the helper macro !IS_ROOT to replace parent != dentry->d_parent. Just clean up.
--- fs/autofs4/root.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/autofs4/root.c +3 -3
@@ -558,7 +558,7 @@ static int autofs4_dir_symlink(struct inode *dir,dget (dentry);atomic_inc (&ino->count); p_ino =autofs4_dentry_ino (dentry->d_parent); -if (p_ino && dentry->d_parent != dentry) +if (p_ino && !IS_ROOT (dentry))atomic_inc (&p_ino->count); dir->i_mtime =CURRENT_TIME ;
@@ -593,7 +593,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)if (atomic_dec_and_test (&ino->count)) { p_ino =autofs4_dentry_ino (dentry->d_parent); -if (p_ino && dentry->d_parent != dentry) +if (p_ino && !IS_ROOT (dentry))atomic_dec (&p_ino->count); }dput (ino->dentry);
@@ -732,7 +732,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, umode_t mdget (dentry);atomic_inc (&ino->count); p_ino =autofs4_dentry_ino (dentry->d_parent); -if (p_ino && dentry->d_parent != dentry) +if (p_ino && !IS_ROOT (dentry))atomic_inc (&p_ino->count);inc_nlink (dir); dir->i_mtime =CURRENT_TIME ;