X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_internal.h;h=36bede947e1aa949198994e073db47202eb2aa60;hp=2b2b23ea6635c0a9b069cb83b83a4e6175fef740;hb=69efa174743f5ad2425c0ccd951961ae356fed0d;hpb=5a8d36f40484b070cf16e17ad0ca49c6397009e3 diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h index 2b2b23e..36bede9 100644 --- a/lustre/mdd/mdd_internal.h +++ b/lustre/mdd/mdd_internal.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. */ /* @@ -41,8 +41,6 @@ #ifndef _MDD_INTERNAL_H #define _MDD_INTERNAL_H -#include - #include #include #include @@ -50,7 +48,6 @@ #include #include #include -#include #ifdef HAVE_QUOTA_SUPPORT # include #endif @@ -67,6 +64,10 @@ static inline void mdd_quota_wrapper(struct lu_attr *la, unsigned int *qids) } #endif +/* PDO lock is unnecessary for current MDT stack because operations + * are already protected by ldlm lock */ +#define MDD_DISABLE_PDO_LOCK 1 + enum mdd_txn_op { MDD_TXN_OBJECT_DESTROY_OP = 0, MDD_TXN_OBJECT_CREATE_OP, @@ -102,13 +103,12 @@ struct mdd_txn_op_descr { #define CLM_PURGE 0x40000 struct mdd_changelog { - spinlock_t mc_lock; /* for index */ - cfs_waitq_t mc_waitq; + cfs_spinlock_t mc_lock; /* for index */ int mc_flags; int mc_mask; __u64 mc_index; __u64 mc_starttime; - spinlock_t mc_user_lock; + cfs_spinlock_t mc_user_lock; int mc_lastuser; }; @@ -132,6 +132,7 @@ struct mdd_device { unsigned long mdd_atime_diff; struct mdd_object *mdd_dot_lustre; struct mdd_dot_lustre_objs mdd_dot_lustre_objs; + unsigned int mdd_sync_permission; }; enum mod_flags { @@ -162,7 +163,9 @@ struct mdd_object { __u32 mod_valid; __u64 mod_cltime; unsigned long mod_flags; +#ifndef MDD_DISABLE_PDO_LOCK struct dynlock mod_pdlock; +#endif #ifdef CONFIG_LOCKDEP /* "dep_map" name is assumed by lockdep.h macros. */ struct lockdep_map dep_map; @@ -184,7 +187,6 @@ struct mdd_thread_info { struct lu_name mti_name; struct obdo mti_oa; char mti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE]; - struct lu_fid_pack mti_pack; struct dt_allocation_hint mti_hint; struct lov_mds_md *mti_max_lmm; int mti_max_lmm_size; @@ -227,6 +229,11 @@ void mdd_lov_objid_update(struct mdd_device *mdd, struct lov_mds_md *lmm); void mdd_lov_create_finish(const struct lu_env *env, struct mdd_device *mdd, struct lov_mds_md *lmm, int lmm_size, const struct md_op_spec *spec); +int mdd_file_lock(const struct lu_env *env, struct md_object *obj, + struct lov_mds_md *lmm, struct ldlm_extent *extent, + struct lustre_handle *lockh); +int mdd_file_unlock(const struct lu_env *env, struct md_object *obj, + struct lov_mds_md *lmm, struct lustre_handle *lockh); int mdd_get_md(const struct lu_env *env, struct mdd_object *obj, void *md, int *md_size, const char *name); int mdd_get_md_locked(const struct lu_env *env, struct mdd_object *obj, @@ -248,6 +255,8 @@ int mdd_object_kill(const struct lu_env *env, struct mdd_object *obj, struct md_attr *ma); int mdd_iattr_get(const struct lu_env *env, struct mdd_object *mdd_obj, struct md_attr *ma); +int mdd_attr_get_internal(const struct lu_env *env, struct mdd_object *mdd_obj, + struct md_attr *ma); int mdd_attr_get_internal_locked(const struct lu_env *env, struct mdd_object *mdd_obj, struct md_attr *ma); @@ -274,18 +283,14 @@ int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj); void mdd_pdlock_init(struct mdd_object *obj); unsigned long mdd_name2hash(const char *name); -struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env, - struct mdd_object *obj, - const char *name, - enum mdd_object_role role); -struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env, - struct mdd_object *obj, - const char *name, - enum mdd_object_role role); +void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj, + const char *name, enum mdd_object_role role); +void *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj, + const char *name, enum mdd_object_role role); void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj, - struct dynlock_handle *dlh); + void *dlh); void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj, - struct dynlock_handle *dlh); + void *dlh); /* mdd_dir.c */ int mdd_is_subdir(const struct lu_env *env, struct md_object *mo, const struct lu_fid *fid, struct lu_fid *sfid); @@ -374,11 +379,11 @@ extern const struct lu_device_operations mdd_lu_ops; struct mdd_object *mdd_object_find(const struct lu_env *env, struct mdd_device *d, const struct lu_fid *f); -int mdd_get_default_md(struct mdd_object *mdd_obj, struct lov_mds_md *lmm, - int *size); +int mdd_get_default_md(struct mdd_object *mdd_obj, struct lov_mds_md *lmm); int mdd_readpage(const struct lu_env *env, struct md_object *obj, const struct lu_rdpg *rdpg); - +int mdd_changelog(const struct lu_env *env, enum changelog_rec_type type, + int flags, struct md_object *obj); /* mdd_quota.c*/ #ifdef HAVE_QUOTA_SUPPORT int mdd_quota_notify(const struct lu_env *env, struct md_device *m); @@ -387,7 +392,7 @@ int mdd_quota_setup(const struct lu_env *env, struct md_device *m, int mdd_quota_cleanup(const struct lu_env *env, struct md_device *m); int mdd_quota_recovery(const struct lu_env *env, struct md_device *m); int mdd_quota_check(const struct lu_env *env, struct md_device *m, - struct obd_export *exp, __u32 type); + __u32 type); int mdd_quota_on(const struct lu_env *env, struct md_device *m, __u32 type); int mdd_quota_off(const struct lu_env *env, struct md_device *m, @@ -546,16 +551,7 @@ static inline const struct lu_fid *mdo2fid(const struct mdd_object *obj) return lu_object_fid(&obj->mod_obj.mo_lu); } -static inline const struct dt_rec *__mdd_fid_rec(const struct lu_env *env, - const struct lu_fid *fid) -{ - struct lu_fid_pack *pack = &mdd_env_info(env)->mti_pack; - - fid_pack(pack, fid, &mdd_env_info(env)->mti_fid2); - return (const struct dt_rec *)pack; -} - -static inline umode_t mdd_object_type(const struct mdd_object *obj) +static inline cfs_umode_t mdd_object_type(const struct mdd_object *obj) { return lu_object_attr(&obj->mod_obj.mo_lu); }