X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flocal_storage.h;h=9a7244e9536b995764c57713ab6934d98b1ed3d3;hb=c394068ee148595711c661651368b91373bcc78a;hp=f7d6c9a48a7d4049ba19e3b804521badd8561a7c;hpb=3e38436dc09097429e1ca1fbfa3ef4981e124715;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/local_storage.h b/lustre/obdclass/local_storage.h index f7d6c9a..9a7244e 100644 --- a/lustre/obdclass/local_storage.h +++ b/lustre/obdclass/local_storage.h @@ -42,7 +42,7 @@ struct ls_device { /* all initialized ls_devices on this node linked by this */ cfs_list_t 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 */ @@ -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);