Merge tag 'fbdev-v5.2' of git://github.com/bzolnier/linux

[sfrench/cifs-2.6.git] / include / rdma / uverbs_std_types.h

diff --git a/include/rdma/uverbs_std_types.h b/include/rdma/uverbs_std_types.h
index 794c4756597180bb5c94cf6022781cecd1cb634a..05eabfd5d0d3e3cfe453c84359e05bfa4103c129 100644 (file)
--- a/include/rdma/uverbs_std_types.h
+++ b/include/rdma/uverbs_std_types.h
@@ -48,17 +48,15 @@
 #define uobj_get_type(_attrs, _object)                                         \
        uapi_get_object((_attrs)->ufile->device->uapi, _object)
 
-struct ib_uobject *_uobj_get_read(enum uverbs_default_objects type,
-                                 u32 object_id,
-                                 struct uverbs_attr_bundle *attrs);
-
 #define uobj_get_read(_type, _id, _attrs)                                      \
-       _uobj_get_read(_type, _uobj_check_id(_id), _attrs)
+       rdma_lookup_get_uobject(uobj_get_type(_attrs, _type), (_attrs)->ufile, \
+                               _uobj_check_id(_id), UVERBS_LOOKUP_READ,       \
+                               _attrs)
 
 #define ufd_get_read(_type, _fdnum, _attrs)                                    \
        rdma_lookup_get_uobject(uobj_get_type(_attrs, _type), (_attrs)->ufile, \
                                (_fdnum)*typecheck(s32, _fdnum),               \
-                               UVERBS_LOOKUP_READ)
+                               UVERBS_LOOKUP_READ, _attrs)
 
 static inline void *_uobj_get_obj_read(struct ib_uobject *uobj)
 {
@@ -70,22 +68,19 @@ static inline void *_uobj_get_obj_read(struct ib_uobject *uobj)
        ((struct ib_##_object *)_uobj_get_obj_read(                            \
                uobj_get_read(_type, _id, _attrs)))
 
-struct ib_uobject *_uobj_get_write(enum uverbs_default_objects type,
-                                  u32 object_id,
-                                  struct uverbs_attr_bundle *attrs);
-
 #define uobj_get_write(_type, _id, _attrs)                                     \
-       _uobj_get_write(_type, _uobj_check_id(_id), _attrs)
+       rdma_lookup_get_uobject(uobj_get_type(_attrs, _type), (_attrs)->ufile, \
+                               _uobj_check_id(_id), UVERBS_LOOKUP_WRITE,      \
+                               _attrs)
 
 int __uobj_perform_destroy(const struct uverbs_api_object *obj, u32 id,
-                          const struct uverbs_attr_bundle *attrs);
+                          struct uverbs_attr_bundle *attrs);
 #define uobj_perform_destroy(_type, _id, _attrs)                               \
        __uobj_perform_destroy(uobj_get_type(_attrs, _type),                   \
                               _uobj_check_id(_id), _attrs)
 
 struct ib_uobject *__uobj_get_destroy(const struct uverbs_api_object *obj,
-                                     u32 id,
-                                     const struct uverbs_attr_bundle *attrs);
+                                     u32 id, struct uverbs_attr_bundle *attrs);
 
 #define uobj_get_destroy(_type, _id, _attrs)                                   \
        __uobj_get_destroy(uobj_get_type(_attrs, _type), _uobj_check_id(_id),  \
@@ -109,30 +104,31 @@ static inline void uobj_put_write(struct ib_uobject *uobj)
        rdma_lookup_put_uobject(uobj, UVERBS_LOOKUP_WRITE);
 }
 
-static inline int __must_check uobj_alloc_commit(struct ib_uobject *uobj)
+static inline int __must_check
+uobj_alloc_commit(struct ib_uobject *uobj, struct uverbs_attr_bundle *attrs)
 {
-       int ret = rdma_alloc_commit_uobject(uobj);
+       int ret = rdma_alloc_commit_uobject(uobj, attrs);
 
        if (ret)
                return ret;
        return 0;
 }
 
-static inline void uobj_alloc_abort(struct ib_uobject *uobj)
+static inline void uobj_alloc_abort(struct ib_uobject *uobj,
+                                   struct uverbs_attr_bundle *attrs)
 {
-       rdma_alloc_abort_uobject(uobj);
+       rdma_alloc_abort_uobject(uobj, attrs);
 }
 
 static inline struct ib_uobject *
 __uobj_alloc(const struct uverbs_api_object *obj,
             struct uverbs_attr_bundle *attrs, struct ib_device **ib_dev)
 {
-       struct ib_uobject *uobj = rdma_alloc_begin_uobject(obj, attrs->ufile);
+       struct ib_uobject *uobj =
+               rdma_alloc_begin_uobject(obj, attrs->ufile, attrs);
 
-       if (!IS_ERR(uobj)) {
-               *ib_dev = uobj->context->device;
-               attrs->context = uobj->context;
-       }
+       if (!IS_ERR(uobj))
+               *ib_dev = attrs->context->device;
        return uobj;
 }