reiserfs: fix hang on umount with quotas when journal is aborted

Call dquot_drop() from reiserfs_dquot_drop() even if we fail to start a
transaction.  Otherwise we never get to dropping references to quota
structures from the inode and umount will hang indefinitely.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index f8f9a47..a4c9770 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1890,8 +1890,14 @@ static int reiserfs_dquot_drop(struct inode *inode)
        ret =
            journal_begin(&th, inode->i_sb,
                          2 * REISERFS_QUOTA_DEL_BLOCKS(inode->i_sb));
-       if (ret)
+       if (ret) {
+               /*
+                * We call dquot_drop() anyway to at least release references
+                * to quota structures so that umount does not hang.
+                */
+               dquot_drop(inode);
                goto out;
+       }
        ret = dquot_drop(inode);
        err =
            journal_end(&th, inode->i_sb,