1 files changed, 14 insertions, 0 deletions

diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 62330f283951..190ed61bcd42 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -475,6 +475,13 @@ xfs_vn_unlink(
         if (likely(!error)) {
                 xfs_validate_fields(dir);       /* size needs update */
                 xfs_validate_fields(inode);
+                /*
+                 * With unlink, the VFS makes the dentry "negative": no inode,
+                 * but still hashed. This is incompatible with case-insensitive
+                 * mode, so invalidate (unhash) the dentry in CI-mode.
+                 */
+                if (xfs_sb_version_hasasciici(&XFS_M(dir->i_sb)->m_sb))
+                        d_invalidate(dentry);
         }
         return -error;
 }
@@ -531,6 +538,13 @@ xfs_vn_rmdir(
         if (likely(!error)) {
                 xfs_validate_fields(inode);
                 xfs_validate_fields(dir);
+                /*
+                 * With rmdir, the VFS makes the dentry "negative": no inode,
+                 * but still hashed. This is incompatible with case-insensitive
+                 * mode, so invalidate (unhash) the dentry in CI-mode.
+                 */
+                if (xfs_sb_version_hasasciici(&XFS_M(dir->i_sb)->m_sb))
+                        d_invalidate(dentry);
         }
         return -error;
 }