Subject: [merged] autofs-fix-the-return-value-of-autofs4_fill_super.patch removed from -mm tree
To: rui.xiang@xxxxxxxxxx,raven@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Jan 2014 11:02:20 -0800
The patch titled
Subject: autofs: fix the return value of autofs4_fill_super
has been removed from the -mm tree. Its filename was
autofs-fix-the-return-value-of-autofs4_fill_super.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Rui Xiang <rui.xiang@xxxxxxxxxx>
Subject: autofs: fix the return value of autofs4_fill_super
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@xxxxxxxxxx>
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/autofs4/inode.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff -puN fs/autofs4/inode.c~autofs-fix-the-return-value-of-autofs4_fill_super fs/autofs4/inode.c
--- a/fs/autofs4/inode.c~autofs-fix-the-return-value-of-autofs4_fill_super
+++ a/fs/autofs4/inode.c
@@ -212,10 +212,11 @@ int autofs4_fill_super(struct super_bloc
struct autofs_info *ino;
int pgrp;
bool pgrp_set = false;
+ 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;
@@ -249,8 +250,10 @@ int autofs4_fill_super(struct super_bloc
* 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)
@@ -308,7 +311,8 @@ int autofs4_fill_super(struct super_bloc
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;
@@ -336,8 +340,7 @@ fail_free:
put_pid(sbi->oz_pgrp);
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)
_
Patches currently in -mm which might be from rui.xiang@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
