From 8830b6dd03605203d70b2e59373f41975ce97895 Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Fri, 25 Mar 2011 01:51:14 +0800
Subject: [PATCH] --- yaml --- r: 242335 b: refs/heads/master c:
 f9398c233e3201874395eea8558eb616fb198648 h: refs/heads/master i:   242333:
 4cd7eeffa9fef22775cd6b7b652ca5bf907f1c3d   242331:
 e5da566d993770be9384faf74d98dd1e74fcaf0d   242327:
 0392b76df51f892205830217ecf992c5527f4d62   242319:
 b3f088fb2388618e5ffbb9730033ebdec8164c82   242303:
 5d7b8e2c2dded5bf668ba559f0c2314c711d2f6c v: v3

---
 [refs]                    | 2 +-
 trunk/fs/autofs4/expire.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c00bc3bb9100..6436c3a223b9 100644
--- 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
index c896dd6c1ea9..c403abcc725b 100644
--- a/trunk/fs/autofs4/expire.c
+++ b/trunk/fs/autofs4/expire.c
@@ -290,10 +290,8 @@ 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;
@@ -301,6 +299,7 @@ struct dentry *autofs4_expire_direct(struct super_block *sb,
 		spin_unlock(&sbi->fs_lock);
 		return root;
 	}
+out:
 	spin_unlock(&sbi->fs_lock);
 	dput(root);