diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-26 16:34:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-02 00:41:47 -0400 |
| commit | 6b1f79d5df9f2735192ed1a40c711cf131d4f43e (patch) | |
| tree | 67f007fabd01964145cac4f273902f1c12927e8b /include/linux | |
| parent | c1a8e27a3fad202750a1b66a1fd1fa82a8a5bd92 (diff) | |
Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshotsv0.29
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kernel.h | 8 | ||||
| -rw-r--r-- | include/linux/poison.h | 6 | ||||
| -rw-r--r-- | include/linux/types.h | 1 | ||||
| -rw-r--r-- | include/linux/uuid.h | 5 | ||||
| -rw-r--r-- | include/linux/xattr.h | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a55b8a9b..01466c40 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -96,6 +96,14 @@ (type *)((char *)__mptr - offsetof(type, member)); }) #endif +#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ + union { \ + struct { MEMBERS } ATTRS; \ + struct TAG { MEMBERS } ATTRS NAME; \ + } +#define struct_group(NAME, MEMBERS...) \ + __struct_group(/* no tag */, NAME, /* no attrs */, MEMBERS) + #define max(x, y) ({ \ typeof(x) _max1 = (x); \ typeof(y) _max2 = (y); \ diff --git a/include/linux/poison.h b/include/linux/poison.h index 2d3249eb..851a855d 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h @@ -81,7 +81,13 @@ /********** net/core/page_pool.c **********/ #define PP_SIGNATURE (0x40 + POISON_POINTER_DELTA) +/********** net/core/skbuff.c **********/ +#define SKB_LIST_POISON_NEXT ((void *)(0x800 + POISON_POINTER_DELTA)) + /********** kernel/bpf/ **********/ #define BPF_PTR_POISON ((void *)(0xeB9FUL + POISON_POINTER_DELTA)) +/********** VFS **********/ +#define VFS_PTR_POISON ((void *)(0xF5 + POISON_POINTER_DELTA)) + #endif diff --git a/include/linux/types.h b/include/linux/types.h index fc05e23a..ce454e26 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -82,5 +82,6 @@ typedef int (*cmp_func_t)(const void *a, const void *b); typedef unsigned int __bitwise slab_flags_t; typedef u64 phys_addr_t; struct vm_struct; +struct mnt_idmap; #endif /* _TOOLS_LINUX_TYPES_H_ */ diff --git a/include/linux/uuid.h b/include/linux/uuid.h index c8eeb708..4674746f 100644 --- a/include/linux/uuid.h +++ b/include/linux/uuid.h @@ -41,9 +41,4 @@ typedef struct { ((c) >> 8) & 0xff, (c) & 0xff, \ (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) -static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2) -{ - return memcmp(&u1, &u2, sizeof(uuid_le)); -} - #endif diff --git a/include/linux/xattr.h b/include/linux/xattr.h index 222c72fe..dcdff6e8 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -42,7 +42,7 @@ struct xattr_handler { struct inode *inode, const char *name, void *buffer, size_t size); int (*set)(const struct xattr_handler *, - struct user_namespace *mnt_userns, struct dentry *dentry, + struct mnt_idmap *idmap, struct dentry *dentry, struct inode *inode, const char *name, const void *buffer, size_t size, int flags); }; |