public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] A couple of maintenance fixes for autofs
@ 2013-12-03  5:11 Ian Kent
  2013-12-03  5:11 ` [PATCH 1/2] autofs: fix the return value of autofs4_fill_super Ian Kent
  2013-12-03  5:11 ` [PATCH 2/2] autofs: use IS_ROOT to replace root dentry checks Ian Kent
  0 siblings, 2 replies; 4+ messages in thread
From: Ian Kent @ 2013-12-03  5:11 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-fsdevel, Rui Xiang, autofs mailing list,
	Kernel Mailing List

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(-)

-- 
Ian

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 1/2] autofs: fix the return value of autofs4_fill_super
@ 2013-08-30  7:22 Rui Xiang
  0 siblings, 0 replies; 4+ messages in thread
From: Rui Xiang @ 2013-08-30  7:22 UTC (permalink / raw)
  To: Ian Kent; +Cc: autofs, linux-kernel, Rui Xiang

While kzallocing sbi/ino fails, it should return -ENOMEM.

And it should return the err value from autofs_prepare_pipe.

Signed-off-by: Rui Xiang <rui.xiang@huawei.com>
---
 fs/autofs4/inode.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index b104726..fe390ed 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -211,10 +211,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;
@@ -248,8 +249,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)
@@ -296,7 +299,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;
@@ -323,8 +327,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)
-- 
1.8.2.2



^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-03  5:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-03  5:11 [PATCH 0/2] A couple of maintenance fixes for autofs Ian Kent
2013-12-03  5:11 ` [PATCH 1/2] autofs: fix the return value of autofs4_fill_super Ian Kent
2013-12-03  5:11 ` [PATCH 2/2] autofs: use IS_ROOT to replace root dentry checks Ian Kent
  -- strict thread matches above, loose matches on Subject: below --
2013-08-30  7:22 [PATCH 1/2] autofs: fix the return value of autofs4_fill_super Rui Xiang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox