diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-08-03 09:10:08 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-08-03 09:10:08 +0300 |
| commit | 3b5d1afd1f13bcab85eaa28223ad396694f929e3 (patch) | |
| tree | 02983e414b3d918114c15b8410ab46c245a07a29 /include/rdma/uverbs_ioctl.h | |
| parent | f1ec5be17b9aafbc5f573da023850566b43d8e5e (diff) | |
| parent | 2ac82e20e2377fb0b63ce40bba56558f2df7cd3e (diff) | |
| download | linux-3b5d1afd1f13bcab85eaa28223ad396694f929e3.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/rdma/uverbs_ioctl.h')
| -rw-r--r-- | include/rdma/uverbs_ioctl.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/rdma/uverbs_ioctl.h b/include/rdma/uverbs_ioctl.h index 9f3b1e004046..86de10ea30af 100644 --- a/include/rdma/uverbs_ioctl.h +++ b/include/rdma/uverbs_ioctl.h @@ -420,9 +420,9 @@ struct uapi_definition { .scope = UAPI_SCOPE_OBJECT, \ .needs_fn_offset = \ offsetof(struct ib_device_ops, ibdev_fn) + \ - BUILD_BUG_ON_ZERO( \ - sizeof(((struct ib_device_ops *)0)->ibdev_fn) != \ - sizeof(void *)), \ + BUILD_BUG_ON_ZERO(sizeof_field(struct ib_device_ops, \ + ibdev_fn) != \ + sizeof(void *)), \ } /* @@ -435,9 +435,9 @@ struct uapi_definition { .scope = UAPI_SCOPE_METHOD, \ .needs_fn_offset = \ offsetof(struct ib_device_ops, ibdev_fn) + \ - BUILD_BUG_ON_ZERO( \ - sizeof(((struct ib_device_ops *)0)->ibdev_fn) != \ - sizeof(void *)), \ + BUILD_BUG_ON_ZERO(sizeof_field(struct ib_device_ops, \ + ibdev_fn) != \ + sizeof(void *)), \ } /* Call a function to determine if the entire object is supported or not */ @@ -491,8 +491,7 @@ struct uapi_definition { */ #define UVERBS_ATTR_STRUCT(_type, _last) \ .zero_trailing = 1, \ - UVERBS_ATTR_SIZE(((uintptr_t)(&((_type *)0)->_last + 1)), \ - sizeof(_type)) + UVERBS_ATTR_SIZE(offsetofend(_type, _last), sizeof(_type)) /* * Specifies at least min_len bytes must be passed in, but the amount can be * larger, up to the protocol maximum size. No check for zeroing is done. @@ -737,6 +736,9 @@ uverbs_attr_get_len(const struct uverbs_attr_bundle *attrs_bundle, u16 idx) return attr->ptr_attr.len; } +void uverbs_finalize_uobj_create(const struct uverbs_attr_bundle *attrs_bundle, + u16 idx); + /* * uverbs_attr_ptr_get_array_size() - Get array size pointer by a ptr * attribute. |