Merge with /home/shaggy/git/linus-clean/

/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 77e059149212..161f156d98c8 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -612,6 +612,7 @@ got:
         err = ext2_init_acl(inode, dir);
         if (err) {
                 DQUOT_FREE_INODE(inode);
+                DQUOT_DROP(inode);
                 goto fail2;
         }
         mark_inode_dirty(inode);