History

Merge tag 'vfs-6.18-rc7.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs

Pull vfs fixes from Christian Brauner: - Fix unitialized variable in statmount_string() - Fix hostfs mounting when passing host root during boot - Fix dynamic lookup to fail on cell lookup failure - Fix missing file type when reading bfs inodes from disk - Enforce checking of sb_min_blocksize() calls and update all callers accordingly - Restore write access before closing files opened by open_exec() in binfmt_misc - Always freeze efivarfs during suspend/hibernate cycles - Fix statmount()'s and listmount()'s grab_requested_mnt_ns() helper to actually allow mount namespace file descriptor in addition to mount namespace ids - Fix tmpfs remount when noswap is specified - Switch Landlock to iput_not_last() to remove false-positives from might_sleep() annotations in iput() - Remove dead node_to_mnt_ns() code - Ensure that per-queue kobjects are successfully created * tag 'vfs-6.18-rc7.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs: landlock: fix splats from iput() after it started calling might_sleep() fs: add iput_not_last() shmem: fix tmpfs reconfiguration (remount) when noswap is set fs/namespace: correctly handle errors returned by grab_requested_mnt_ns power: always freeze efivarfs binfmt_misc: restore write access before closing files opened by open_exec() block: add __must_check attribute to sb_min_blocksize() virtio-fs: fix incorrect check for fsvq->kobj xfs: check the return value of sb_min_blocksize() in xfs_fs_fill_super isofs: check the return value of sb_min_blocksize() in isofs_fill_super exfat: check return value of sb_min_blocksize in exfat_read_boot_sector vfat: fix missing sb_min_blocksize() return value checks mnt: Remove dead code which might prevent from building bfs: Reconstruct file type when loading from disk afs: Fix dynamic lookup to fail on cell lookup failure hostfs: Fix only passing host root in boot stage with new mount fs: Fix uninitialized 'offp' in statmount_string()

Linus Torvalds committed 12 months ago

Commit e7c375b2 parents 418592a e9d50b726 files · +206 −91Browse files

Showing the changes to kernel (2 of 26 files). Show all

Unified · Split

2 files
  1. kernel/power/hibernate.c +3 −6
  2. kernel/power/suspend.c +1 −2
kernel/power/hibernate.c+3−6
@@ -821,8 +821,7 @@ int hibernate(void) · 820 unmodified lines
821821 goto Restore;
822822
823823 ksys_sync_helper();
824− if (filesystem_freeze_enabled)
825− filesystems_freeze();
824+ filesystems_freeze(filesystem_freeze_enabled);
826825
827826 error = freeze_processes();
828827 if (error)
@@ -928,8 +927,7 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data) · 99 unmodified lines
928927 if (error)
929928 goto restore;
930929
931− if (filesystem_freeze_enabled)
932− filesystems_freeze();
930+ filesystems_freeze(filesystem_freeze_enabled);
933931
934932 error = freeze_processes();
935933 if (error)
@@ -1079,8 +1077,7 @@ static int software_resume(void) · 143 unmodified lines
10791077 if (error)
10801078 goto Restore;
10811079
1082− if (filesystem_freeze_enabled)
1083− filesystems_freeze();
1080+ filesystems_freeze(filesystem_freeze_enabled);
10841081
10851082 pm_pr_dbg("Preparing processes for hibernation restore.\n");
10861083 error = freeze_processes();
kernel/power/suspend.c+1−2
@@ -375,8 +375,7 @@ static int suspend_prepare(suspend_state_t state) · 374 unmodified lines
375375 if (error)
376376 goto Restore;
377377
378− if (filesystem_freeze_enabled)
379− filesystems_freeze();
378+ filesystems_freeze(filesystem_freeze_enabled);
380379 trace_suspend_resume(TPS("freeze_processes"), 0, true);
381380 error = suspend_freeze_processes();
382381 trace_suspend_resume(TPS("freeze_processes"), 0, false);