Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333277
b: refs/heads/master
c: 49999ab
h: refs/heads/master
i:
  333275: 6d2e38a
v: v3
  • Loading branch information
Ian Kent authored and Linus Torvalds committed Oct 11, 2012
1 parent 4f75193 commit 5b05b5e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 14ffe009ca60856555df3aec942239d8beed74d3
refs/heads/master: 49999ab27eab6289a8e4f450e148bdab521361b2
6 changes: 4 additions & 2 deletions trunk/fs/autofs4/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,12 @@ static struct vfsmount *autofs4_d_automount(struct path *path)
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)) {
Expand Down

0 comments on commit 5b05b5e

Please sign in to comment.