[ 25/62] autofs4 - fix reset pending flag on mount fail
From: Greg Kroah-Hartman
Date: Thu Oct 18 2012 - 23:32:15 EST
- Next message: Greg Kroah-Hartman: "[ 10/62] tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking"
- Previous message: Greg Kroah-Hartman: "[ 05/62] ACPI: EC: Make the GPE storm threshold a module parameter"
- In reply to: Greg Kroah-Hartman: "[ 05/62] ACPI: EC: Make the GPE storm threshold a module parameter"
- Next in thread: Greg Kroah-Hartman: "[ 10/62] tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Kent <raven@xxxxxxxxxx>
commit 49999ab27eab6289a8e4f450e148bdab521361b2 upstream.
In autofs4_d_automount(), if a mount fail occurs the AUTOFS_INF_PENDING
mount pending flag is not cleared.
One effect of this is when using the "browse" option, directory entry
attributes show up with all "?"s due to the incorrect callback and
subsequent failure return (when in fact no callback should be made).
Signed-off-by: Ian Kent <ikent@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/autofs4/root.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -392,10 +392,12 @@ static struct vfsmount *autofs4_d_automo
ino->flags |= AUTOFS_INF_PENDING;
spin_unlock(&sbi->fs_lock);
status = autofs4_mount_wait(dentry);
- if (status)
- return ERR_PTR(status);
spin_lock(&sbi->fs_lock);
ino->flags &= ~AUTOFS_INF_PENDING;
+ if (status) {
+ spin_unlock(&sbi->fs_lock);
+ return ERR_PTR(status);
+ }
}
done:
if (!(ino->flags & AUTOFS_INF_EXPIRING)) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Next message: Greg Kroah-Hartman: "[ 10/62] tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking"
- Previous message: Greg Kroah-Hartman: "[ 05/62] ACPI: EC: Make the GPE storm threshold a module parameter"
- In reply to: Greg Kroah-Hartman: "[ 05/62] ACPI: EC: Make the GPE storm threshold a module parameter"
- Next in thread: Greg Kroah-Hartman: "[ 10/62] tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]