aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-10 21:02:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:06 -0400
commit5fc79d85d2ab7ce144bc75e06cab58126249afbb (patch)
treef6c4ca70e3905cbec541d925f4199c020fa61d8b
parent89596f20bb5f0f32c37abd337d995080e04519c8 (diff)
autofs4: remove unneeded null check in try_to_fill_dentry()
After 97e7449a7ad: "autofs4: fix indirect mount pending expire race" we no longer assumed that "ino" can be null. The other null checks got removed but this was one was missed. Signed-off-by: Dan Carpenter <error27@gmail.com> Cc: Ian Kent <raven@themaw.net> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/autofs4/root.c3
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;