b=23014 sgpdd-survey acc-sm integration

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

diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h
index 5afe871..afe8d35 100644 (file)
--- a/lustre/include/md_object.h
+++ b/lustre/include/md_object.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -84,7 +84,7 @@ struct md_ucred {
         __u32               mu_suppgids[2];
         cfs_cap_t           mu_cap;
         __u32               mu_umask;
-        struct group_info  *mu_ginfo;
+        cfs_group_info_t   *mu_ginfo;
         struct md_identity *mu_identity;
 };
 
@@ -344,7 +344,7 @@ struct md_device_operations {
                                int *md_size, int *cookie_size);
 
         int (*mdo_statfs)(const struct lu_env *env, struct md_device *m,
-                          struct kstatfs *sfs);
+                          cfs_kstatfs_t *sfs);
 
         int (*mdo_init_capa_ctxt)(const struct lu_env *env, struct md_device *m,
                                   int mode, unsigned long timeout, __u32 alg,
@@ -447,7 +447,7 @@ enum md_upcall_event {
 struct md_upcall {
         /** this lock protects upcall using against its removal
          * read lock is for usage the upcall, write - for init/fini */
-        struct rw_semaphore     mu_upcall_sem;
+        cfs_rw_semaphore_t      mu_upcall_sem;
         /** device to call, upper layer normally */
         struct md_device       *mu_upcall_dev;
         /** upcall function */
@@ -463,38 +463,38 @@ struct md_device {
 
 static inline void md_upcall_init(struct md_device *m, void *upcl)
 {
-        init_rwsem(&m->md_upcall.mu_upcall_sem);
+        cfs_init_rwsem(&m->md_upcall.mu_upcall_sem);
         m->md_upcall.mu_upcall_dev = NULL;
         m->md_upcall.mu_upcall = upcl;
 }
 
 static inline void md_upcall_dev_set(struct md_device *m, struct md_device *up)
 {
-        down_write(&m->md_upcall.mu_upcall_sem);
+        cfs_down_write(&m->md_upcall.mu_upcall_sem);
         m->md_upcall.mu_upcall_dev = up;
-        up_write(&m->md_upcall.mu_upcall_sem);
+        cfs_up_write(&m->md_upcall.mu_upcall_sem);
 }
 
 static inline void md_upcall_fini(struct md_device *m)
 {
-        down_write(&m->md_upcall.mu_upcall_sem);
+        cfs_down_write(&m->md_upcall.mu_upcall_sem);
         m->md_upcall.mu_upcall_dev = NULL;
         m->md_upcall.mu_upcall = NULL;
-        up_write(&m->md_upcall.mu_upcall_sem);
+        cfs_up_write(&m->md_upcall.mu_upcall_sem);
 }
 
 static inline int md_do_upcall(const struct lu_env *env, struct md_device *m,
                                enum md_upcall_event ev, void *data)
 {
         int rc = 0;
-        down_read(&m->md_upcall.mu_upcall_sem);
+        cfs_down_read(&m->md_upcall.mu_upcall_sem);
         if (m->md_upcall.mu_upcall_dev != NULL &&
             m->md_upcall.mu_upcall_dev->md_upcall.mu_upcall != NULL) {
                 rc = m->md_upcall.mu_upcall_dev->md_upcall.mu_upcall(env,
                                               m->md_upcall.mu_upcall_dev,
                                               ev, data);
         }
-        up_read(&m->md_upcall.mu_upcall_sem);
+        cfs_up_read(&m->md_upcall.mu_upcall_sem);
         return rc;
 }
 
@@ -876,8 +876,8 @@ struct lu_local_obj_desc {
         const char                      *llod_name;
         __u32                            llod_oid;
         int                              llod_is_index;
-        const struct dt_index_features * llod_feat;
-        struct list_head                 llod_linkage;
+        const struct dt_index_features  *llod_feat;
+        cfs_list_t                       llod_linkage;
 };
 
 struct md_object *llo_store_resolve(const struct lu_env *env,