LU-2272 statahead: ll_intent_drop_lock() called in spinlock

[fs/lustre-release.git] / lustre / osp / osp_internal.h

diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
index 6f12c20..16bca57 100644 (file)
--- a/lustre/osp/osp_internal.h
+++ b/lustre/osp/osp_internal.h
@@ -119,7 +119,7 @@ struct osp_device {
        struct obd_uuid                  opd_cluuid;
        struct obd_connect_data         *opd_connect_data;
        int                              opd_connects;
-       cfs_proc_dir_entry_t            *opd_proc_entry;
+       struct proc_dir_entry           *opd_proc_entry;
        struct lprocfs_stats            *opd_stats;
        /* connection status. */
        unsigned int                     opd_new_connection:1,
@@ -188,7 +188,7 @@ struct osp_device {
        /* how often to update statfs data */
        int                              opd_statfs_maxage;
 
-       cfs_proc_dir_entry_t            *opd_symlink;
+       struct proc_dir_entry           *opd_symlink;
 
        /* If the caller wants to do some idempotent async operations on
         * remote server, it can append the async remote requests on the
@@ -220,9 +220,9 @@ struct osp_xattr_entry {
        struct list_head         oxe_list;
        atomic_t                 oxe_ref;
        void                    *oxe_value;
-       int                      oxe_buflen;
-       int                      oxe_namelen;
-       int                      oxe_vallen;
+       size_t                   oxe_buflen;
+       size_t                   oxe_namelen;
+       size_t                   oxe_vallen;
        unsigned int             oxe_exist:1,
                                 oxe_ready:1;
        char                     oxe_buf[0];
@@ -280,6 +280,7 @@ struct osp_thread_info {
 struct osp_it {
        __u32                     ooi_pos_page;
        __u32                     ooi_pos_lu_page;
+       __u32                     ooi_attr;
        int                       ooi_pos_ent;
        int                       ooi_total_npages;
        int                       ooi_valid_npages;
@@ -505,10 +506,10 @@ void osp_update_last_id(struct osp_device *d, obd_id objid);
 extern struct llog_operations osp_mds_ost_orig_logops;
 
 /* osp_trans.c */
-int osp_insert_async_request(const struct lu_env *env,
-                            int op, struct osp_object *obj, int count,
-                            int *lens, const char **bufs, void *data,
-                            osp_async_request_interpreter_t interpterer);
+int osp_insert_async_request(const struct lu_env *env, enum update_type op,
+                            struct osp_object *obj, int count, __u16 *lens,
+                            const void **bufs, void *data,
+                            osp_async_request_interpreter_t interpreter);
 int osp_unplug_async_request(const struct lu_env *env,
                             struct osp_device *osp,
                             struct dt_update_request *update);
@@ -563,11 +564,8 @@ int osp_md_declare_object_create(const struct lu_env *env,
 int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
                         struct lu_attr *attr, struct dt_allocation_hint *hint,
                         struct dt_object_format *dof, struct thandle *th);
-int osp_md_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
-                           const struct lu_attr *attr, struct thandle *th);
-int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
-                   const struct lu_attr *attr, struct thandle *th,
-                   struct lustre_capa *capa);
+int __osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
+                     const struct lu_attr *attr, struct thandle *th);
 extern const struct dt_index_operations osp_md_index_ops;
 
 /* osp_precreate.c */