diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /fs/autofs4/root.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/autofs4/root.c')
| -rw-r--r-- | fs/autofs4/root.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 48e056e70fd6..cb1bd38dc08c 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
| @@ -204,8 +204,7 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags) | |||
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | /* Initialize expiry counter after successful mount */ | 206 | /* Initialize expiry counter after successful mount */ |
| 207 | if (ino) | 207 | ino->last_used = jiffies; |
| 208 | ino->last_used = jiffies; | ||
| 209 | 208 | ||
| 210 | spin_lock(&sbi->fs_lock); | 209 | spin_lock(&sbi->fs_lock); |
| 211 | ino->flags &= ~AUTOFS_INF_PENDING; | 210 | ino->flags &= ~AUTOFS_INF_PENDING; |