X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fmd_object.h;h=4537c7bd9fa9e10fc2e852199c3356b70f580292;hp=2048cc659b65e2ae83278556640c65a44fee354b;hb=a067251099b6b225f2409f680d9e4423253d0730;hpb=f4547f0569774eb794fb143362e201f658415f4c diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h index 2048cc6..4537c7b 100644 --- a/lustre/include/md_object.h +++ b/lustre/include/md_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, Intel Corporation. + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -57,11 +57,6 @@ * super-class definitions. */ #include -#include - -/* LU-1051, temperary solution to reduce llog credits */ -#define DECLARE_LLOG_REWRITE 0 -#define DECLARE_LLOG_WRITE INT_MAX struct md_device; struct md_device_operations; @@ -69,13 +64,6 @@ struct md_object; struct obd_export; enum { - UCRED_INVALID = -1, - UCRED_INIT = 0, - UCRED_OLD = 1, - UCRED_NEW = 2 -}; - -enum { MD_CAPAINFO_MAX = 5 }; @@ -174,7 +162,6 @@ struct md_attr { struct lustre_capa *ma_capa; struct md_som_data *ma_som; int ma_lmm_size; - int ma_big_lmm_used:1; int ma_lmv_size; int ma_acl_size; int ma_cookie_size; @@ -200,12 +187,12 @@ struct md_op_spec { /** Create flag from client: such as MDS_OPEN_CREAT, and others. */ __u64 sp_cr_flags; - /** don't create lov objects or llog cookie - this replay */ + /** don't create lov objects or llog cookie - this replay */ unsigned int no_create:1, - /** Should mdd do lookup sanity check or not. */ - sp_cr_lookup:1; + sp_cr_lookup:1, /* do lookup sanity check or not. */ + sp_rm_entry:1; /* only remove name entry */ - /** Current lock mode for parent dir where create is performing. */ + /** Current lock mode for parent dir where create is performing. */ mdl_mode_t sp_cr_mode; /** to create directory */ @@ -277,14 +264,17 @@ struct md_object_operations { struct lustre_capa *, int renewal); int (*moo_object_sync)(const struct lu_env *, struct md_object *); - int (*moo_path)(const struct lu_env *env, struct md_object *obj, - char *path, int pathlen, __u64 *recno, int *linkno); - int (*moo_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 (*moo_file_unlock)(const struct lu_env *env, struct md_object *obj, - struct lov_mds_md *lmm, - struct lustre_handle *lockh); + + int (*moo_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 (*moo_file_unlock)(const struct lu_env *env, struct md_object *obj, + struct lov_mds_md *lmm, + struct lustre_handle *lockh); + int (*moo_object_lock)(const struct lu_env *env, struct md_object *obj, + struct lustre_handle *lh, + struct ldlm_enqueue_info *einfo, + void *policy); }; /** @@ -322,9 +312,9 @@ struct md_dir_operations { struct md_object *src_obj, const struct lu_name *lname, struct md_attr *ma); - int (*mdo_unlink)(const struct lu_env *env, struct md_object *pobj, - struct md_object *cobj, const struct lu_name *lname, - struct md_attr *ma); + int (*mdo_unlink)(const struct lu_env *env, struct md_object *pobj, + struct md_object *cobj, const struct lu_name *lname, + struct md_attr *ma, int no_name); /** This method is used to compare a requested layout to an existing * layout (struct lov_mds_md_v1/3 vs struct lov_mds_md_v1/3) */ @@ -352,8 +342,8 @@ struct md_dir_operations { struct md_device_operations { /** meta-data device related handlers. */ - int (*mdo_root_get)(const struct lu_env *env, struct md_device *m, - struct lu_fid *f); + int (*mdo_root_get)(const struct lu_env *env, struct md_device *m, + struct lu_fid *f); int (*mdo_maxsize_get)(const struct lu_env *env, struct md_device *m, int *md_size, int *cookie_size); @@ -478,11 +468,6 @@ struct seq_server_site { struct lu_client_seq *ss_client_seq; }; -static inline int lu_device_is_md(const struct lu_device *d) -{ - return ergo(d != NULL, d->ld_type->ldt_tags & LU_DEVICE_MD); -} - static inline struct md_device *lu2md_dev(const struct lu_device *d) { LASSERT(IS_ERR(d) || lu_device_is_md(d)); @@ -511,11 +496,6 @@ static inline struct md_device *md_obj2dev(const struct md_object *o) return container_of0(o->mo_lu.lo_dev, struct md_device, md_lu_dev); } -static inline struct seq_server_site *lu_site2seq(const struct lu_site *s) -{ - return s->ld_seq_site; -} - static inline int md_device_init(struct md_device *md, struct lu_device_type *t) { return lu_device_init(&md->md_lu_dev, t); @@ -682,14 +662,6 @@ static inline int mo_capa_get(const struct lu_env *env, return m->mo_ops->moo_capa_get(env, m, c, renewal); } -static inline int mo_path(const struct lu_env *env, struct md_object *m, - char *path, int pathlen, __u64 *recno, int *linkno) -{ - if (m->mo_ops->moo_path == NULL) - return -ENOSYS; - return m->mo_ops->moo_path(env, m, path, pathlen, recno, linkno); -} - static inline int mo_object_sync(const struct lu_env *env, struct md_object *m) { LASSERT(m->mo_ops->moo_object_sync); @@ -713,6 +685,16 @@ static inline int mo_file_unlock(const struct lu_env *env, struct md_object *m, return m->mo_ops->moo_file_unlock(env, m, lmm, lockh); } +static inline int mo_object_lock(const struct lu_env *env, + struct md_object *m, + struct lustre_handle *lh, + struct ldlm_enqueue_info *einfo, + void *policy) +{ + LASSERT(m->mo_ops->moo_object_lock); + return m->mo_ops->moo_object_lock(env, m, lh, einfo, policy); +} + static inline int mdo_lookup(const struct lu_env *env, struct md_object *p, const struct lu_name *lname, @@ -787,13 +769,13 @@ static inline int mdo_link(const struct lu_env *env, } static inline int mdo_unlink(const struct lu_env *env, - struct md_object *p, - struct md_object *c, - const struct lu_name *lname, - struct md_attr *ma) + struct md_object *p, + struct md_object *c, + const struct lu_name *lname, + struct md_attr *ma, int no_name) { - LASSERT(c->mo_dir_ops->mdo_unlink); - return c->mo_dir_ops->mdo_unlink(env, p, c, lname, ma); + LASSERT(p->mo_dir_ops->mdo_unlink); + return p->mo_dir_ops->mdo_unlink(env, p, c, lname, ma, no_name); } static inline int mdo_lum_lmm_cmp(const struct lu_env *env, @@ -865,43 +847,57 @@ struct lu_local_obj_desc { cfs_list_t llod_linkage; }; -struct md_object *llo_store_resolve(const struct lu_env *env, - struct md_device *md, - struct dt_device *dt, - const char *path, - struct lu_fid *fid); - -struct md_object *llo_store_open(const struct lu_env *env, - struct md_device *md, - struct dt_device *dt, - const char *dirname, - const char *objname, - struct lu_fid *fid); - -struct md_object *llo_store_create_index(const struct lu_env *env, - struct md_device *md, - struct dt_device *dt, - const char *dirname, - const char *objname, - const struct lu_fid *fid, - const struct dt_index_features *feat); - -struct md_object *llo_store_create(const struct lu_env *env, - struct md_device *md, - struct dt_device *dt, - const char *dirname, - const char *objname, - const struct lu_fid *fid); - -void llo_local_obj_register(struct lu_local_obj_desc *); -void llo_local_obj_unregister(struct lu_local_obj_desc *); - -int llo_local_objects_setup(const struct lu_env *env, - struct md_device * md, - struct dt_device * dt); - int lustre_buf2som(void *buf, int rc, struct md_som_data *msd); int lustre_buf2hsm(void *buf, int rc, struct md_hsm *mh); void lustre_hsm2buf(void *buf, struct md_hsm *mh); + +enum { + UCRED_INVALID = -1, + UCRED_INIT = 0, + UCRED_OLD = 1, + UCRED_NEW = 2, +}; + +struct lu_ucred { + __u32 uc_valid; + __u32 uc_o_uid; + __u32 uc_o_gid; + __u32 uc_o_fsuid; + __u32 uc_o_fsgid; + __u32 uc_uid; + __u32 uc_gid; + __u32 uc_fsuid; + __u32 uc_fsgid; + __u32 uc_suppgids[2]; + cfs_cap_t uc_cap; + __u32 uc_umask; + cfs_group_info_t *uc_ginfo; + struct md_identity *uc_identity; +}; + +struct lu_ucred *lu_ucred(const struct lu_env *env); + +struct lu_ucred *lu_ucred_check(const struct lu_env *env); + +struct lu_ucred *lu_ucred_assert(const struct lu_env *env); + +int lu_ucred_global_init(void); + +void lu_ucred_global_fini(void); + +#define md_cap_t(x) (x) + +#define MD_CAP_TO_MASK(x) (1 << (x)) + +#define md_cap_raised(c, flag) (md_cap_t(c) & MD_CAP_TO_MASK(flag)) + +/* capable() is copied from linux kernel! */ +static inline int md_capable(struct lu_ucred *uc, cfs_cap_t cap) +{ + if (md_cap_raised(uc->uc_cap, cap)) + return 1; + return 0; +} + /** @} md */ #endif /* _LINUX_MD_OBJECT_H */