mirror of https://github.com/OpenIPC/firmware.git
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff -drupN a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
|
|
--- a/fs/f2fs/xattr.h 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/f2fs/xattr.h 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -58,10 +58,10 @@ struct f2fs_xattr_entry {
|
|
#define XATTR_FIRST_ENTRY(ptr) (XATTR_ENTRY(XATTR_HDR(ptr) + 1))
|
|
#define XATTR_ROUND (3)
|
|
|
|
-#define XATTR_ALIGN(size) ((size + XATTR_ROUND) & ~XATTR_ROUND)
|
|
+#define XATTR_ALIGN(size) (((size) + XATTR_ROUND) & ~XATTR_ROUND)
|
|
|
|
#define ENTRY_SIZE(entry) (XATTR_ALIGN(sizeof(struct f2fs_xattr_entry) + \
|
|
- entry->e_name_len + le16_to_cpu(entry->e_value_size)))
|
|
+ (entry)->e_name_len + le16_to_cpu((entry)->e_value_size)))
|
|
|
|
#define XATTR_NEXT_ENTRY(entry) ((struct f2fs_xattr_entry *)((char *)(entry) +\
|
|
ENTRY_SIZE(entry)))
|
|
@@ -72,9 +72,10 @@ struct f2fs_xattr_entry {
|
|
for (entry = XATTR_FIRST_ENTRY(addr);\
|
|
!IS_XATTR_LAST_ENTRY(entry);\
|
|
entry = XATTR_NEXT_ENTRY(entry))
|
|
-
|
|
-#define MIN_OFFSET(i) XATTR_ALIGN(inline_xattr_size(i) + PAGE_SIZE - \
|
|
- sizeof(struct node_footer) - sizeof(__u32))
|
|
+#define VALID_XATTR_BLOCK_SIZE (PAGE_SIZE - sizeof(struct node_footer))
|
|
+#define XATTR_PADDING_SIZE (sizeof(__u32))
|
|
+#define MIN_OFFSET(i) XATTR_ALIGN(inline_xattr_size(i) + \
|
|
+ VALID_XATTR_BLOCK_SIZE)
|
|
|
|
#define MAX_VALUE_LEN(i) (MIN_OFFSET(i) - \
|
|
sizeof(struct f2fs_xattr_header) - \
|