LU-6070 libcfs: provide separate buffers for libcfs_*2str()

[fs/lustre-release.git] / lustre / obdclass / local_storage.h

diff --git a/lustre/obdclass/local_storage.h b/lustre/obdclass/local_storage.h
index f7d6c9a..7ff6faa 100644 (file)
--- a/lustre/obdclass/local_storage.h
+++ b/lustre/obdclass/local_storage.h
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * lustre/obdclass/local_storage.c
@@ -40,13 +40,13 @@
 struct ls_device {
        struct dt_device         ls_top_dev;
        /* all initialized ls_devices on this node linked by this */
-       cfs_list_t               ls_linkage;
+       struct list_head         ls_linkage;
        /* how many handle's reference this local storage */
-       cfs_atomic_t             ls_refcount;
+       atomic_t                 ls_refcount;
        /* underlaying OSD device */
        struct dt_device        *ls_osd;
        /* list of all local OID storages */
-       cfs_list_t               ls_los_list;
+       struct list_head         ls_los_list;
        struct mutex             ls_los_mutex;
 };
 
@@ -67,9 +67,11 @@ static inline struct ls_object *lu2ls_obj(struct lu_object *o)
 
 static inline struct dt_object *ls_locate(const struct lu_env *env,
                                          struct ls_device *ls,
-                                         const struct lu_fid *fid)
+                                         const struct lu_fid *fid,
+                                         const struct lu_object_conf *conf)
 {
-       return dt_locate_at(env, ls->ls_osd, fid, &ls->ls_top_dev.dd_lu_dev);
+       return dt_locate_at(env, ls->ls_osd, fid,
+                           &ls->ls_top_dev.dd_lu_dev, conf);
 }
 
 struct ls_device *ls_device_get(struct dt_device *dev);