1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index b8af22e610df..91ebb007416c 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -973,6 +973,10 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
         lo->transfer = xfer->transfer;
         lo->ioctl = xfer->ioctl;
 
+        if ((lo->lo_flags & LO_FLAGS_AUTOCLEAR) !=
+             (info->lo_flags & LO_FLAGS_AUTOCLEAR))
+                lo->lo_flags ^= LO_FLAGS_AUTOCLEAR;
+
         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];
@@ -1331,6 +1335,10 @@ static int lo_release(struct inode *inode, struct file *file)
 
         mutex_lock(&lo->lo_ctl_mutex);
         --lo->lo_refcnt;
+
+        if ((lo->lo_flags & LO_FLAGS_AUTOCLEAR) && !lo->lo_refcnt)
+                loop_clr_fd(lo, inode->i_bdev);
+
         mutex_unlock(&lo->lo_ctl_mutex);
 
         return 0;