2 files changed, 2 insertions, 1 deletions

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 8f370e012e61..7cadd823bb31 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -118,7 +118,6 @@ void ext2_free_inode (struct inode * inode)
          * as writing the quota to disk may need the lock as well.
          */
         /* Quota is already initialized in iput() */
-        ext2_xattr_delete_inode(inode);
         dquot_free_inode(inode);
         dquot_drop(inode);
 
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index c3881e56662e..fe60cc1117d8 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -34,6 +34,7 @@
 #include "ext2.h"
 #include "acl.h"
 #include "xip.h"
+#include "xattr.h"
 
 static int __ext2_write_inode(struct inode *inode, int do_sync);
 
@@ -88,6 +89,7 @@ void ext2_evict_inode(struct inode * inode)
                 inode->i_size = 0;
                 if (inode->i_blocks)
                         ext2_truncate_blocks(inode, 0);
+                ext2_xattr_delete_inode(inode);
         }
 
         invalidate_inode_buffers(inode);