X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fdt_object.h;h=1b8f71b04d200c9ed54cc65b438bc18422f14d95;hb=c4f7a77e7bf58d6aa698eca752a39a1ce02947b3;hp=9aa277ec02edff46c88560c51cabf301d31fabdf;hpb=b2287531b63ac56692746a67ea17f576a6d2ab81;p=fs%2Flustre-release.git diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h index 9aa277e..1b8f71b 100644 --- a/lustre/include/dt_object.h +++ b/lustre/include/dt_object.h @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -65,9 +65,9 @@ struct thandle; struct dt_device; struct dt_object; struct dt_index_features; -struct dt_quota_ctxt; struct niobuf_local; struct niobuf_remote; +struct ldlm_enqueue_info; typedef enum { MNTOPT_USERXATTR = 0x00000001, @@ -174,12 +174,6 @@ struct dt_device_operations { struct dt_device *dev, int mode, unsigned long timeout, __u32 alg, struct lustre_capa_key *keys); - /** - * Initialize quota context. - */ - void (*dt_init_quota_ctxt)(const struct lu_env *env, - struct dt_device *dev, - struct dt_quota_ctxt *ctxt, void *data); }; struct dt_index_features { @@ -219,6 +213,7 @@ enum dt_index_flags { */ extern const struct dt_index_features dt_directory_features; extern const struct dt_index_features dt_otable_features; +extern const struct dt_index_features dt_lfsck_features; /* index features supported by the accounting objects */ extern const struct dt_index_features dt_acct_features; @@ -262,6 +257,7 @@ struct dt_object_format { enum dt_format_type dof_type; union { struct dof_regular { + int striped; } dof_reg; struct dof_dir { } dof_dir; @@ -453,6 +449,14 @@ struct dt_object_operations { */ int (*do_data_get)(const struct lu_env *env, struct dt_object *dt, void **data); + + /** + * Lock object. + */ + int (*do_object_lock)(const struct lu_env *env, struct dt_object *dt, + struct lustre_handle *lh, + struct ldlm_enqueue_info *einfo, + void *policy); }; /** @@ -688,7 +692,7 @@ struct local_oid_storage { struct dt_object *los_obj; /* data used to generate new fids */ - cfs_mutex_t los_id_lock; + struct mutex los_id_lock; __u64 los_seq; __u32 los_last_oid; }; @@ -709,6 +713,17 @@ static inline int dt_object_exists(const struct dt_object *dt) return lu_object_exists(&dt->do_lu); } +static inline int dt_object_remote(const struct dt_object *dt) +{ + return lu_object_remote(&dt->do_lu); +} + +static inline struct dt_object *lu2dt_obj(struct lu_object *o) +{ + LASSERT(ergo(o != NULL, lu_device_is_dt(o->lo_dev))); + return container_of0(o, struct dt_object, do_lu); +} + /** * This is the general purpose transaction handle. * 1. Transaction Life Cycle @@ -724,24 +739,32 @@ static inline int dt_object_exists(const struct dt_object *dt) * No RPC request should be issued inside transaction. */ struct thandle { - /** the dt device on which the transactions are executed */ - struct dt_device *th_dev; + /** the dt device on which the transactions are executed */ + struct dt_device *th_dev; + + /** context for this transaction, tag is LCT_TX_HANDLE */ + struct lu_context th_ctx; - /** additional tags (layers can add in declare) */ - __u32 th_tags; + /** additional tags (layers can add in declare) */ + __u32 th_tags; - /** context for this transaction, tag is LCT_TX_HANDLE */ - struct lu_context th_ctx; + /** the last operation result in this transaction. + * this value is used in recovery */ + __s32 th_result; - /** the last operation result in this transaction. - * this value is used in recovery */ - __s32 th_result; + /** whether we need sync commit */ + unsigned int th_sync:1; - /** whether we need sync commit */ - int th_sync:1; + /* local transation, no need to inform other layers */ + unsigned int th_local:1; - /* local transation, no need to inform other layers */ - int th_local:1; + /* In DNE, one transaction can be disassemblied into + * updates on several different MDTs, and these updates + * will be attached to th_remote_update_list per target. + * Only single thread will access the list, no need lock + */ + cfs_list_t th_remote_update_list; + struct update_request *th_current_request; }; /** @@ -790,6 +813,10 @@ int dt_path_parser(const struct lu_env *env, char *local, dt_entry_func_t entry_func, void *data); +struct dt_object * +dt_store_resolve(const struct lu_env *env, struct dt_device *dt, + const char *path, struct lu_fid *fid); + struct dt_object *dt_store_open(const struct lu_env *env, struct dt_device *dt, const char *dirname, @@ -856,6 +883,19 @@ local_index_find_or_create_with_fid(const struct lu_env *env, struct dt_object *parent, const char *name, __u32 mode, const struct dt_index_features *ft); +int local_object_unlink(const struct lu_env *env, struct dt_device *dt, + struct dt_object *parent, const char *name); + +static inline int dt_object_lock(const struct lu_env *env, + struct dt_object *o, struct lustre_handle *lh, + struct ldlm_enqueue_info *einfo, + void *policy) +{ + LASSERT(o); + LASSERT(o->do_ops); + LASSERT(o->do_ops->do_object_lock); + return o->do_ops->do_object_lock(env, o, lh, einfo, policy); +} int dt_lookup_dir(const struct lu_env *env, struct dt_object *dir, const char *name, struct lu_fid *fid); @@ -1437,4 +1477,7 @@ static inline struct dt_thread_info *dt_info(const struct lu_env *env) return dti; } +int dt_global_init(void); +void dt_global_fini(void); + #endif /* __LUSTRE_DT_OBJECT_H */