releases/3.18.3/reiserfs-destroy-allocated-commit-workqueue.patch

   1 From fa0c5540739320258c3e3a45aaae9dae467b2504 Mon Sep 17 00:00:00 2001
   2 From: Jiri Slaby <jslaby@suse.cz>
   3 Date: Fri, 12 Dec 2014 16:29:29 +0100
   4 Subject: reiserfs: destroy allocated commit workqueue
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Jiri Slaby <jslaby@suse.cz>
  10
  11 commit fa0c5540739320258c3e3a45aaae9dae467b2504 upstream.
  12
  13 When resirefs is trying to mount a partition, it creates a commit
  14 workqueue (sbi->commit_wq). But when mount fails later, the workqueue
  15 is not freed.
  16
  17 Signed-off-by: Jiri Slaby <jslaby@suse.cz>
  18 Reported-by: auxsvr@gmail.com
  19 Reported-by: Benoît Monin <benoit.monin@gmx.fr>
  20 Cc: Jan Kara <jack@suse.cz>
  21 Cc: reiserfs-devel@vger.kernel.org
  22 Fixes: 797d9016ceca69879bb273218810fa0beef46aac
  23 Signed-off-by: Jan Kara <jack@suse.cz>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25
  26 ---
  27  fs/reiserfs/super.c |    3 +++
  28  1 file changed, 3 insertions(+)
  29
  30 --- a/fs/reiserfs/super.c
  31 +++ b/fs/reiserfs/super.c
  32 @@ -2161,6 +2161,9 @@ error_unlocked:
  33                 reiserfs_write_unlock(s);
  34         }
  35
  36 +       if (sbi->commit_wq)
  37 +               destroy_workqueue(sbi->commit_wq);
  38 +
  39         cancel_delayed_work_sync(&REISERFS_SB(s)->old_work);
  40
  41         reiserfs_free_bitmap_cache(s);