LU-5478 style: get rid of obd_* typedefs

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 8141f86..7ec8683 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -320,14 +320,14 @@ struct lu_attr;
 struct inode;
 
 void obdo_from_la(struct obdo *dst, const struct lu_attr *la, __u64 valid);
-void la_from_obdo(struct lu_attr *la, const struct obdo *dst, obd_flag valid);
+void la_from_obdo(struct lu_attr *la, const struct obdo *dst, u32 valid);
 void obdo_refresh_inode(struct inode *dst, const struct obdo *src,
-                       obd_flag valid);
+                       u32 valid);
 
-void obdo_cpy_md(struct obdo *dst, const struct obdo *src, obd_flag valid);
+void obdo_cpy_md(struct obdo *dst, const struct obdo *src, u32 valid);
 void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj);
 void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa,
-                 obd_flag valid);
+                 u32 valid);
 
 #define OBT(dev)        (dev)->obd_type
 #define OBP(dev, op)    (dev)->obd_type->typ_dt_ops->o_ ## op
@@ -487,9 +487,10 @@ static inline int class_devno_max(void)
 }
 
 static inline int obd_get_info(const struct lu_env *env,
-                               struct obd_export *exp, __u32 keylen,
-                               void *key, __u32 *vallen, void *val,
-                               struct lov_stripe_md *lsm)
+                              struct obd_export *exp,
+                              __u32 keylen, void *key,
+                              __u32 *vallen, void *val,
+                              struct lov_stripe_md *lsm)
 {
         int rc;
         ENTRY;
@@ -503,9 +504,10 @@ static inline int obd_get_info(const struct lu_env *env,
 }
 
 static inline int obd_set_info_async(const struct lu_env *env,
-                                     struct obd_export *exp, obd_count keylen,
-                                     void *key, obd_count vallen, void *val,
-                                     struct ptlrpc_request_set *set)
+                                    struct obd_export *exp,
+                                    __u32 keylen, void *key,
+                                    __u32 vallen, void *val,
+                                    struct ptlrpc_request_set *set)
 {
         int rc;
         ENTRY;
@@ -1679,11 +1681,11 @@ static inline int md_merge_attr(struct obd_export *exp,
 }
 
 static inline int md_setxattr(struct obd_export *exp,
-                              const struct lu_fid *fid, struct obd_capa *oc,
-                              obd_valid valid, const char *name,
-                              const char *input, int input_size,
-                              int output_size, int flags, __u32 suppgid,
-                              struct ptlrpc_request **request)
+                             const struct lu_fid *fid, struct obd_capa *oc,
+                             u64 valid, const char *name,
+                             const char *input, int input_size,
+                             int output_size, int flags, __u32 suppgid,
+                             struct ptlrpc_request **request)
 {
         ENTRY;
         EXP_CHECK_MD_OP(exp, setxattr);
@@ -1694,11 +1696,11 @@ static inline int md_setxattr(struct obd_export *exp,
 }
 
 static inline int md_getxattr(struct obd_export *exp,
-                              const struct lu_fid *fid, struct obd_capa *oc,
-                              obd_valid valid, const char *name,
-                              const char *input, int input_size,
-                              int output_size, int flags,
-                              struct ptlrpc_request **request)
+                             const struct lu_fid *fid, struct obd_capa *oc,
+                             u64 valid, const char *name,
+                             const char *input, int input_size,
+                             int output_size, int flags,
+                             struct ptlrpc_request **request)
 {
         ENTRY;
         EXP_CHECK_MD_OP(exp, getxattr);