Up to 6.1.43

[packages/kernel.git] / kernel-aufs.patch

diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index 7e7993434dc4e25fc91a02e6dc4d8533f9d39983..719baa5bf51b63673bc0299b06a1e29544138831 100644 (file)
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -571,8 +571,8 @@ index 214c70e1d059..dccbb939d2a9 100644
                        region = pregion;
                        result = start;
 @@ -1241,10 +1241,10 @@ unsigned long do_mmap(struct file *file,
-       up_write(&nommu_region_sem);
  error:
+       mas_destroy(&mas);
        if (region->vm_file)
 -              fput(region->vm_file);
 +              vmr_fput(region);
@@ -39562,8 +39562,8 @@ index 8ca56da3ca69..9ac6f67edf09 100644
        struct address_space *mapping;
        int error;
 @@ -1031,6 +1055,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
-       /* suppress uevents while reconfiguring the device */
-       dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 1);
+       /* This is safe, since we have a reference from open(). */
+       __module_get(THIS_MODULE);
  
 +      f = loop_real_file(file);
 +      if (f) {
@@ -39591,7 +39591,7 @@ index 8ca56da3ca69..9ac6f67edf09 100644
 +              fput(virt_file);
        /* This is safe: open() is still holding a reference. */
        module_put(THIS_MODULE);
-       goto done;
+       return error;
 @@ -1154,6 +1188,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
  static void __loop_clr_fd(struct loop_device *lo, bool release)
  {