hfsplus: fix volume corruption issue for generic/101

The xfstests' test-case generic/101 leaves HFS+ volume
in corrupted state:

sudo ./check generic/101
FSTYP -- hfsplus
PLATFORM -- Linux/x86_64 hfsplus-testing-0001 6.17.0-rc1+ #4 SMP PREEMPT_DYNAMIC Wed Oct 1 15:02:44 PDT 2025
MKFS_OPTIONS -- /dev/loop51
MOUNT_OPTIONS -- /dev/loop51 /mnt/scratch

generic/101 _check_generic_filesystem: filesystem on /dev/loop51 is inconsistent
(see XFSTESTS-2/xfstests-dev/results//generic/101.full for details)

Ran: generic/101
Failures: generic/101
Failed 1 of 1 tests

sudo fsck.hfsplus -d /dev/loop51
** /dev/loop51
Using cacheBlockSize=32K cacheTotalBlock=1024 cacheSize=32768K.
Executing fsck_hfs (version 540.1-Linux).
** Checking non-journaled HFS Plus Volume.
The volume name is untitled
** Checking extents overflow file.
** Checking catalog file.
** Checking multi-linked files.
** Checking catalog hierarchy.
** Checking extended attributes file.
** Checking volume bitmap.
** Checking volume information.
Invalid volume free block count
(It should be 2614350 instead of 2614382)
Verify Status: VIStat = 0x8000, ABTStat = 0x0000 EBTStat = 0x0000
CBTStat = 0x0000 CatStat = 0x00000000
** Repairing volume.
** Rechecking volume.
** Checking non-journaled HFS Plus Volume.
The volume name is untitled
** Checking extents overflow file.
** Checking catalog file.
** Checking multi-linked files.
** Checking catalog hierarchy.
** Checking extended attributes file.
** Checking volume bitmap.
** Checking volume information.
** The volume untitled was repaired successfully.

This test executes such steps: "Test that if we truncate a file
to a smaller size, then truncate it to its original size or
a larger size, then fsyncing it and a power failure happens,
the file will have the range [first_truncate_size, last_size[ with
all bytes having a value of 0x00 if we read it the next time
the filesystem is mounted.".

HFS+ keeps volume's free block count in the superblock.
However, hfsplus_file_fsync() doesn't store superblock's
content. As a result, superblock contains not correct
value of free blocks if a power failure happens.

This patch adds functionality of saving superblock's
content during hfsplus_file_fsync() call.

sudo ./check generic/101
FSTYP         -- hfsplus
PLATFORM      -- Linux/x86_64 hfsplus-testing-0001 6.18.0-rc3+ #96 SMP PREEMPT_DYNAMIC Wed Nov 19 12:47:37 PST 2025
MKFS_OPTIONS  -- /dev/loop51
MOUNT_OPTIONS -- /dev/loop51 /mnt/scratch

generic/101 32s ...  30s
Ran: generic/101
Passed all 1 tests

sudo fsck.hfsplus -d /dev/loop51
** /dev/loop51
	Using cacheBlockSize=32K cacheTotalBlock=1024 cacheSize=32768K.
   Executing fsck_hfs (version 540.1-Linux).
** Checking non-journaled HFS Plus Volume.
   The volume name is untitled
** Checking extents overflow file.
** Checking catalog file.
** Checking multi-linked files.
** Checking catalog hierarchy.
** Checking extended attributes file.
** Checking volume bitmap.
** Checking volume information.
** The volume untitled appears to be OK.

Signed-off-by: Viacheslav Dubeyko <slava@dubeyko.com>
cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
cc: Yangtao Li <frank.li@vivo.com>
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20251119223219.1824434-1-slava@dubeyko.com
Signed-off-by: Viacheslav Dubeyko <slava@dubeyko.com>

diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index 5ce9efe966af4c5d0ebd37608c12c13a994e51c9..56dcd80a62ba20a35cd9b02d2ef136f4f4d9cc28 100644 (file)
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -477,6 +477,8 @@ int hfs_part_find(struct super_block *sb, sector_t *part_start,
 /* super.c */
 struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino);
 void hfsplus_mark_mdb_dirty(struct super_block *sb);
+void hfsplus_prepare_volume_header_for_commit(struct hfsplus_vh *vhdr);
+int hfsplus_commit_superblock(struct super_block *sb);
 
 /* tables.c */
 extern u16 hfsplus_case_fold_table[];

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index e290e417ed3a7c61857eeb939406f0b2ce6b0161..7ae6745ca7ae12985ffc2843326338580c4e2a1a 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -325,6 +325,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
        struct inode *inode = file->f_mapping->host;
        struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
        struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
+       struct hfsplus_vh *vhdr = sbi->s_vhdr;
        int error = 0, error2;
 
        error = file_write_and_wait_range(file, start, end);
@@ -368,6 +369,14 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
                        error = error2;
        }
 
+       mutex_lock(&sbi->vh_mutex);
+       hfsplus_prepare_volume_header_for_commit(vhdr);
+       mutex_unlock(&sbi->vh_mutex);
+
+       error2 = hfsplus_commit_superblock(inode->i_sb);
+       if (!error)
+               error = error2;
+
        if (!test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags))
                blkdev_issue_flush(inode->i_sb->s_bdev);
 

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 16bc4abc67e08febcb71a774d9c0aa192699f2de..67a7a2a093476d76cafb3c5b3a4c54989732c11f 100644 (file)
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -187,40 +187,15 @@ static void hfsplus_evict_inode(struct inode *inode)
        }
 }
 
-static int hfsplus_sync_fs(struct super_block *sb, int wait)
+int hfsplus_commit_superblock(struct super_block *sb)
 {
        struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
        struct hfsplus_vh *vhdr = sbi->s_vhdr;
        int write_backup = 0;
-       int error, error2;
-
-       if (!wait)
-               return 0;
+       int error = 0, error2;
 
        hfs_dbg("starting...\n");
 
-       /*
-        * Explicitly write out the special metadata inodes.
-        *
-        * While these special inodes are marked as hashed and written
-        * out peridocically by the flusher threads we redirty them
-        * during writeout of normal inodes, and thus the life lock
-        * prevents us from getting the latest state to disk.
-        */
-       error = filemap_write_and_wait(sbi->cat_tree->inode->i_mapping);
-       error2 = filemap_write_and_wait(sbi->ext_tree->inode->i_mapping);
-       if (!error)
-               error = error2;
-       if (sbi->attr_tree) {
-               error2 =
-                   filemap_write_and_wait(sbi->attr_tree->inode->i_mapping);
-               if (!error)
-                       error = error2;
-       }
-       error2 = filemap_write_and_wait(sbi->alloc_file->i_mapping);
-       if (!error)
-               error = error2;
-
        mutex_lock(&sbi->vh_mutex);
        mutex_lock(&sbi->alloc_mutex);
        vhdr->free_blocks = cpu_to_be32(sbi->free_blocks);
@@ -249,11 +224,52 @@ static int hfsplus_sync_fs(struct super_block *sb, int wait)
                                  sbi->part_start + sbi->sect_count - 2,
                                  sbi->s_backup_vhdr_buf, NULL, REQ_OP_WRITE);
        if (!error)
-               error2 = error;
+               error = error2;
 out:
        mutex_unlock(&sbi->alloc_mutex);
        mutex_unlock(&sbi->vh_mutex);
 
+       hfs_dbg("finished: err %d\n", error);
+
+       return error;
+}
+
+static int hfsplus_sync_fs(struct super_block *sb, int wait)
+{
+       struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
+       int error, error2;
+
+       if (!wait)
+               return 0;
+
+       hfs_dbg("starting...\n");
+
+       /*
+        * Explicitly write out the special metadata inodes.
+        *
+        * While these special inodes are marked as hashed and written
+        * out peridocically by the flusher threads we redirty them
+        * during writeout of normal inodes, and thus the life lock
+        * prevents us from getting the latest state to disk.
+        */
+       error = filemap_write_and_wait(sbi->cat_tree->inode->i_mapping);
+       error2 = filemap_write_and_wait(sbi->ext_tree->inode->i_mapping);
+       if (!error)
+               error = error2;
+       if (sbi->attr_tree) {
+               error2 =
+                   filemap_write_and_wait(sbi->attr_tree->inode->i_mapping);
+               if (!error)
+                       error = error2;
+       }
+       error2 = filemap_write_and_wait(sbi->alloc_file->i_mapping);
+       if (!error)
+               error = error2;
+
+       error2 = hfsplus_commit_superblock(sb);
+       if (!error)
+               error = error2;
+
        if (!test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags))
                blkdev_issue_flush(sb->s_bdev);
 
@@ -395,6 +411,15 @@ static const struct super_operations hfsplus_sops = {
        .show_options   = hfsplus_show_options,
 };
 
+void hfsplus_prepare_volume_header_for_commit(struct hfsplus_vh *vhdr)
+{
+       vhdr->last_mount_vers = cpu_to_be32(HFSP_MOUNT_VERSION);
+       vhdr->modify_date = hfsp_now2mt();
+       be32_add_cpu(&vhdr->write_count, 1);
+       vhdr->attributes &= cpu_to_be32(~HFSPLUS_VOL_UNMNT);
+       vhdr->attributes |= cpu_to_be32(HFSPLUS_VOL_INCNSTNT);
+}
+
 static int hfsplus_fill_super(struct super_block *sb, struct fs_context *fc)
 {
        struct hfsplus_vh *vhdr;
@@ -562,11 +587,7 @@ static int hfsplus_fill_super(struct super_block *sb, struct fs_context *fc)
                 * H+LX == hfsplusutils, H+Lx == this driver, H+lx is unused
                 * all three are registered with Apple for our use
                 */
-               vhdr->last_mount_vers = cpu_to_be32(HFSP_MOUNT_VERSION);
-               vhdr->modify_date = hfsp_now2mt();
-               be32_add_cpu(&vhdr->write_count, 1);
-               vhdr->attributes &= cpu_to_be32(~HFSPLUS_VOL_UNMNT);
-               vhdr->attributes |= cpu_to_be32(HFSPLUS_VOL_INCNSTNT);
+               hfsplus_prepare_volume_header_for_commit(vhdr);
                hfsplus_sync_fs(sb, 1);
 
                if (!sbi->hidden_dir) {