aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/fat/namei_vfat.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index d585398f9f6b..bf326d4356a3 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -745,13 +745,12 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
745 * 745 *
746 * Switch to new one for reason of locality if possible. 746 * Switch to new one for reason of locality if possible.
747 */ 747 */
748 if (d_invalidate(alias) == 0) 748 BUG_ON(d_unhashed(alias));
749 dput(alias); 749 if (!S_ISDIR(inode->i_mode))
750 else { 750 d_move(alias, dentry);
751 iput(inode); 751 iput(inode);
752 unlock_super(sb); 752 unlock_super(sb);
753 return alias; 753 return alias;
754 }
755 } 754 }
756out: 755out:
757 unlock_super(sb); 756 unlock_super(sb);