Fix APFS driver

t2linux · Aug 25, 2024 · 91849e0 · 91849e0
1 parent 277b278
commit 91849e0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/8001-Add-APFS-driver.patch b/8001-Add-APFS-driver.patch
@@ -6098,7 +6098,7 @@ index 000000000..c8ae4092a
 +#include <linux/blk_types.h>
 +#include "apfs.h"
 +
-+#define MAX(X, Y)	((X) <= (Y) ? (Y) : (X))
++#define APFS_MAX(X, Y)	((X) <= (Y) ? (Y) : (X))
 +
 +/**
 + * apfs_ext_is_hole - Does this extent represent a hole in a sparse file?
@@ -8063,7 +8063,7 @@ index 000000000..c8ae4092a
 +	prev_end = prev_ext.bno + prev_ext.blkcount;
 +	if (prev_end < *paddr_end) {
 +		/* The extent to put is part of a snapshot */
-+		tmp.phys_block_num = MAX(prev_end, paddr_min);
++		tmp.phys_block_num = APFS_MAX(prev_end, paddr_min);
 +		tmp.len = (*paddr_end - tmp.phys_block_num) << sb->s_blocksize_bits;
 +		ret = apfs_create_update_pext(query, &tmp, -1);
 +		*paddr_end = tmp.phys_block_num;
@@ -8203,7 +8203,7 @@ index 000000000..c8ae4092a
 +	prev_end = prev_ext.bno + prev_ext.blkcount;
 +	if (prev_end < *paddr_end) {
 +		/* The extent to take is part of a snapshot */
-+		tmp.phys_block_num = MAX(prev_end, paddr_min);
++		tmp.phys_block_num = APFS_MAX(prev_end, paddr_min);
 +		tmp.len = (*paddr_end - tmp.phys_block_num) << sb->s_blocksize_bits;
 +		ret = apfs_create_update_pext(query, &tmp, +1);
 +		*paddr_end = tmp.phys_block_num;