---

yaml --- r: 242335 b: refs/heads/master c: f9398c2 h: refs/heads/master i: 242333: 4cd7eef 242331: e5da566 242327: 0392b76 242319: b3f088f 242303: 5d7b8e2 v: v3
git-mirror · Mar 24, 2011 · 8830b6d · 8830b6d
1 parent f4d8f48
commit 8830b6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c3199852905ceb90a70e98777e71d369a5f0823
+refs/heads/master: f9398c233e3201874395eea8558eb616fb198648
diff --git a/trunk/fs/autofs4/expire.c b/trunk/fs/autofs4/expire.c
@@ -290,17 +290,16 @@ struct dentry *autofs4_expire_direct(struct super_block *sb,
 	spin_lock(&sbi->fs_lock);
 	ino = autofs4_dentry_ino(root);
 	/* No point expiring a pending mount */
-	if (ino->flags & AUTOFS_INF_PENDING) {
-		spin_unlock(&sbi->fs_lock);
-		return NULL;
-	}
+	if (ino->flags & AUTOFS_INF_PENDING)
+		goto out;
 	if (!autofs4_direct_busy(mnt, root, timeout, do_now)) {
 		struct autofs_info *ino = autofs4_dentry_ino(root);
 		ino->flags |= AUTOFS_INF_EXPIRING;
 		init_completion(&ino->expire_complete);
 		spin_unlock(&sbi->fs_lock);
 		return root;
 	}
+out:
 	spin_unlock(&sbi->fs_lock);
 	dput(root);