X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_internal.h;h=1769f3eb82e1bbc9437ecd5841bbfa9f4712869b;hp=f32b4a8fb331e0032af4dfaa4924c6556ee247e0;hb=cb85c0364fd8323f4bb03c481660805da66aaf85;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;ds=sidebyside diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h index f32b4a8..1769f3e 100644 --- a/lustre/mdc/mdc_internal.h +++ b/lustre/mdc/mdc_internal.h @@ -27,7 +27,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Intel Corporation. + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,25 +38,19 @@ #define _MDC_INTERNAL_H #include -#include #ifdef LPROCFS -void lprocfs_mdc_init_vars(struct lprocfs_static_vars *lvars); -#else -static inline void lprocfs_mdc_init_vars(struct lprocfs_static_vars *lvars) -{ - memset(lvars, 0, sizeof(*lvars)); -} +extern struct lprocfs_seq_vars lprocfs_mdc_obd_vars[]; #endif void mdc_pack_body(struct ptlrpc_request *req, const struct lu_fid *fid, struct obd_capa *oc, __u64 valid, int ea_size, __u32 suppgid, int flags); -void mdc_pack_capa(struct ptlrpc_request *req, const struct req_msg_field *field, - struct obd_capa *oc); +void mdc_pack_capa(struct ptlrpc_request *req, + const struct req_msg_field *field, struct obd_capa *oc); int mdc_pack_req(struct ptlrpc_request *req, int version, int opc); -void mdc_is_subdir_pack(struct ptlrpc_request *req, const struct lu_fid *pfid, - const struct lu_fid *cfid, int flags); +void mdc_swap_layouts_pack(struct ptlrpc_request *req, + struct md_op_data *op_data); void mdc_readdir_pack(struct ptlrpc_request *req, __u64 pgoff, __u32 size, const struct lu_fid *fid, struct obd_capa *oc); void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, int flags, @@ -67,44 +61,42 @@ void mdc_create_pack(struct ptlrpc_request *req, struct md_op_data *op_data, const void *data, int datalen, __u32 mode, __u32 uid, __u32 gid, cfs_cap_t capability, __u64 rdev); void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data, - __u32 mode, __u64 rdev, __u32 flags, const void *data, - int datalen); + __u32 mode, __u64 rdev, __u64 flags, const void *data, + int datalen); void mdc_unlink_pack(struct ptlrpc_request *req, struct md_op_data *op_data); +void mdc_getxattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data); void mdc_link_pack(struct ptlrpc_request *req, struct md_op_data *op_data); void mdc_rename_pack(struct ptlrpc_request *req, struct md_op_data *op_data, const char *old, int oldlen, const char *new, int newlen); void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data); -int mdc_enter_request(struct client_obd *cli); -void mdc_exit_request(struct client_obd *cli); /* mdc/mdc_locks.c */ int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data, __u64 *bits); -int mdc_change_cbdata(struct obd_export *exp, const struct lu_fid *fid, - ldlm_iterator_t it, void *data); +int mdc_null_inode(struct obd_export *exp, const struct lu_fid *fid); int mdc_find_cbdata(struct obd_export *exp, const struct lu_fid *fid, ldlm_iterator_t it, void *data); int mdc_intent_lock(struct obd_export *exp, - struct md_op_data *, - void *lmm, int lmmsize, - struct lookup_intent *, int, - struct ptlrpc_request **reqp, + struct md_op_data *op_data, + struct lookup_intent *it, + struct ptlrpc_request **reqp, ldlm_blocking_callback cb_blocking, __u64 extra_lock_flags); + int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, - struct lookup_intent *it, struct md_op_data *op_data, - struct lustre_handle *lockh, void *lmm, int lmmsize, - struct ptlrpc_request **req, __u64 extra_lock_flags); + const union ldlm_policy_data *policy, + struct lookup_intent *it, struct md_op_data *op_data, + struct lustre_handle *lockh, __u64 extra_lock_flags); -int mdc_resource_get_unused(struct obd_export *exp, struct lu_fid *fid, - cfs_list_t *cancels, ldlm_mode_t mode, +int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid, + struct list_head *cancels, ldlm_mode_t mode, __u64 bits); /* mdc/mdc_request.c */ -int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid, - struct md_op_data *op_data); +int mdc_fid_alloc(const struct lu_env *env, struct obd_export *exp, + struct lu_fid *fid, struct md_op_data *op_data); int mdc_open(struct obd_export *exp, obd_id ino, int type, int flags, struct lov_mds_md *lmm, int lmm_size, struct lustre_handle *fh, @@ -119,8 +111,8 @@ int mdc_get_lustre_md(struct obd_export *md_exp, struct ptlrpc_request *req, int mdc_free_lustre_md(struct obd_export *exp, struct lustre_md *md); int mdc_set_open_replay_data(struct obd_export *exp, - struct obd_client_handle *och, - struct ptlrpc_request *open_req); + struct obd_client_handle *och, + struct lookup_intent *it); int mdc_clear_open_replay_data(struct obd_export *exp, struct obd_client_handle *och); @@ -168,4 +160,22 @@ ldlm_mode_t mdc_lock_match(struct obd_export *exp, __u64 flags, ldlm_policy_data_t *policy, ldlm_mode_t mode, struct lustre_handle *lockh); +static inline int mdc_prep_elc_req(struct obd_export *exp, + struct ptlrpc_request *req, int opc, + struct list_head *cancels, int count) +{ + return ldlm_prep_elc_req(exp, req, LUSTRE_MDS_VERSION, opc, 0, cancels, + count); +} + +static inline unsigned long hash_x_index(__u64 hash, int hash64) +{ +#ifdef __KERNEL__ + if (BITS_PER_LONG == 32 && hash64) + hash >>= 32; +#endif + /* save hash 0 with hash 1 */ + return ~0UL - (hash + !hash); +} + #endif