Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index b4631046867e..d0e9b3a3905d 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -470,9 +470,6 @@ void autofs4_dentry_release(struct dentry *de)
         if (inf) {
                 struct autofs_sb_info *sbi = autofs4_sbi(de->d_sb);
 
-                inf->dentry = NULL;
-                inf->inode = NULL;
-
                 if (sbi) {
                         spin_lock(&sbi->rehash_lock);
                         if (!list_empty(&inf->rehash))
@@ -480,6 +477,9 @@ void autofs4_dentry_release(struct dentry *de)
                         spin_unlock(&sbi->rehash_lock);
                 }
 
+                inf->dentry = NULL;
+                inf->inode = NULL;
+
                 autofs4_free_ino(inf);
         }
 }