Commit 9d2de6ad2a78bb8b60bf7a54e6043dca44e9a801
Committed by
Linus Torvalds
1 parent
033790449b
autofs4: fix incorrect return from root.c:try_to_fill_dentry()
Jeff Moyer has identified a case where the autofs4 function root.c:try_to_fill_dentry() can return -EBUSY when it should return 0. Jeff's description of the way this happens is: "automount starts an expire for directory d. after the callout to the daemon, but before the rmdir, another process tries to walk into the same directory. It puts itself onto the waitq, pending the expiration. When the expire finishes, the second process is woken up. In try_to_fill_dentry, it does this check: status = d_invalidate(dentry); if (status != -EBUSY) return -EAGAIN; And status is EBUSY. The dentry still has a non-zero d_inode, and the flags do not contain LOOKUP_CONTINUE or LOOKUP_DIRECTORY So, we fall through and return -EBUSY to the caller." Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
fs/autofs4/root.c
... | ... | @@ -243,7 +243,7 @@ |
243 | 243 | struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb); |
244 | 244 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
245 | 245 | struct dentry *new; |
246 | - int status = 0; | |
246 | + int status; | |
247 | 247 | |
248 | 248 | /* Block on any pending expiry here; invalidate the dentry |
249 | 249 | when expiration is done to trigger mount request with a new |
... | ... | @@ -340,7 +340,7 @@ |
340 | 340 | } |
341 | 341 | } |
342 | 342 | |
343 | - return status; | |
343 | + return 0; | |
344 | 344 | } |
345 | 345 | |
346 | 346 | /* For autofs direct mounts the follow link triggers the mount */ |