hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autofs4: fix direct mount pending expire race - correction 

Appologies, somehow I seem to have sent an out dated version of this
patch. Here is an additional patch that brings the patch up to date.

Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ian Kent 2008-07-23 21:30:28 -07:00 committed by Linus Torvalds
parent 6e60a9ab5f
commit ec6e8c7d3f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/autofs4/root.c
View File

@ -241,13 +241,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
/* Follow down to our covering mount. */ /* Follow down to our covering mount. */
if (!follow_down(&nd->path.mnt, &nd->path.dentry)) if (!follow_down(&nd->path.mnt, &nd->path.dentry))
goto done; goto done;
/* goto follow;
* We shouldn't need to do this but we have no way
* of knowing what may have been done so try a follow
* just in case.
*/
autofs4_follow_mount(&nd->path.mnt, &nd->path.dentry);
goto done;
} }
spin_unlock(&sbi->fs_lock); spin_unlock(&sbi->fs_lock);
goto done; goto done;
@ -273,7 +267,7 @@ cont:
/* We trigger a mount for almost all flags */ /* We trigger a mount for almost all flags */
lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS); lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS);
if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING)) if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING))
goto done; goto follow;
/* /*
* If the dentry contains directories then it is an autofs * If the dentry contains directories then it is an autofs