Patch "loop: fix LO_FLAGS_PARTSCAN hang" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
loop: fix LO_FLAGS_PARTSCAN hang
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
loop-fix-lo_flags_partscan-hang.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e02898b423802b1f3a3aaa7f16e896da069ba8f7Mon Sep 17 00:00:00 2001
From: Omar Sandoval <[email protected]>
Date: Wed, 1 Mar 2017 10:42:38 -0800
Subject: loop: fix LO_FLAGS_PARTSCAN hang
From: Omar Sandoval <[email protected]>
commit e02898b423802b1f3a3aaa7f16e896da069ba8f7 upstream.
loop_reread_partitions() needs to do I/O, but we just froze the queue, so we end up waiting forever. This can easily be reproduced with losetup -P. Fix it by moving the reread to after we unfreeze the queue.
--- drivers/block/loop.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/block/loop.c +8 -7
@@ -1153,13 +1153,6 @@ loop_set_status(struct loop_device *lo, (info->lo_flags & LO_FLAGS_AUTOCLEAR)) lo->lo_flags ^= LO_FLAGS_AUTOCLEAR; -if ((info->lo_flags &LO_FLAGS_PARTSCAN ) && - !(lo->lo_flags &LO_FLAGS_PARTSCAN )) { - lo->lo_flags |=LO_FLAGS_PARTSCAN ; - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN ; -loop_reread_partitions (lo, lo->lo_device); - } - lo->lo_encrypt_key_size = info->lo_encrypt_key_size; lo->lo_init[0 ] = info->lo_init[0 ]; lo->lo_init[1 ] = info->lo_init[1 ];
@@ -1174,6 +1167,14 @@ loop_set_status(struct loop_device *lo, exit:blk_mq_unfreeze_queue (lo->lo_queue); + +if (!err && (info->lo_flags &LO_FLAGS_PARTSCAN ) && + !(lo->lo_flags &LO_FLAGS_PARTSCAN )) { + lo->lo_flags |=LO_FLAGS_PARTSCAN ; + lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN ; +loop_reread_partitions (lo, lo->lo_device); + } +return err; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/loop-fix-lo_flags_partscan-hang.patch