diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
| commit | 8320857b1d168fd17d7cee48bbfd04aaf6797be8 (patch) | |
| tree | 58b31d3d9514df93974216f190824d73f9816d9f /fs/autofs4/root.c | |
| parent | 263c08af44741697202b85e631a964ee85200eb0 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
Merge tag 'v3.15-rc6' into next/defconfig
Linux 3.15-rc6
Diffstat (limited to 'fs/autofs4/root.c')
| -rw-r--r-- | fs/autofs4/root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 2caf36ac3e93..cc87c1abac97 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -179,7 +179,7 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry) spin_lock(&active->d_lock); /* Already gone? */ - if (!d_count(active)) + if ((int) d_count(active) <= 0) goto next; qstr = &active->d_name; @@ -230,7 +230,7 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry) spin_lock(&expiring->d_lock); - /* Bad luck, we've already been dentry_iput */ + /* We've already been dentry_iput or unlinked */ if (!expiring->d_inode) goto next; |