X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fid.h;h=e4c8324331f55e72f7bc4040e0114d89aa00419b;hp=f8aba33862491d2943504d1bff061735b4b0318b;hb=7f72fee8c31abd37823386a4587fb5de937b7d3f;hpb=0fda09a56aaf8105c7c5cb0326d0c8fcec6fc04c diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h index f8aba33..e4c8324 100644 --- a/lustre/include/lustre_fid.h +++ b/lustre/include/lustre_fid.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +26,8 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -88,10 +88,15 @@ enum { LUSTRE_SEQ_SUPER_WIDTH = ((1ULL << 30ULL) * LUSTRE_SEQ_META_WIDTH) }; +enum { + /** 2^6 FIDs for OI containers */ + OSD_OI_FID_OID_BITS = 6, + /** reserve enough FIDs in case we want more in the future */ + OSD_OI_FID_OID_BITS_MAX = 10, +}; + /** special OID for local objects */ enum local_oid { - /** \see osd_oi_index_create */ - OSD_OI_FID_16_OID = 2UL, /** \see fld_mod_init */ FLD_INDEX_OID = 3UL, /** \see fid_mod_init */ @@ -102,11 +107,18 @@ enum local_oid { MDD_ORPHAN_OID = 7UL, MDD_LOV_OBJ_OID = 8UL, MDD_CAPA_KEYS_OID = 9UL, - MDD_OBJECTS_OID = 10UL, /** \see mdt_mod_init */ MDT_LAST_RECV_OID = 11UL, - /** \see osd_mod_init */ - OSD_REM_OBJ_DIR_OID = 12UL, + OSD_FS_ROOT_OID = 13UL, + ACCT_USER_OID = 15UL, + ACCT_GROUP_OID = 16UL, + OFD_LAST_RECV_OID = 19UL, + OFD_GROUP0_LAST_OID = 20UL, + OFD_GROUP4K_LAST_OID = 20UL+4096, + OFD_LAST_GROUP_OID = 4117UL, + LLOG_CATALOGS_OID = 4118UL, + MGS_CONFIGS_OID = 4119UL, + OFD_HEALTH_CHECK_OID = 4120UL, }; static inline void lu_local_obj_fid(struct lu_fid *fid, __u32 oid) @@ -116,6 +128,13 @@ static inline void lu_local_obj_fid(struct lu_fid *fid, __u32 oid) fid->f_ver = 0; } +static inline int fid_is_acct(const struct lu_fid *fid) +{ + return fid_seq(fid) == FID_SEQ_LOCAL_FILE && + (fid_oid(fid) == ACCT_USER_OID || + fid_oid(fid) == ACCT_GROUP_OID); +} + enum lu_mgr_type { LUSTRE_SEQ_SERVER, LUSTRE_SEQ_CONTROLLER @@ -132,7 +151,7 @@ struct lu_server_seq; struct lu_client_seq { /* Sequence-controller export. */ struct obd_export *lcs_exp; - cfs_semaphore_t lcs_sem; + cfs_mutex_t lcs_mutex; /* * Range of allowed for allocation sequeces. When using lu_client_seq on @@ -164,6 +183,10 @@ struct lu_client_seq { /* Seq-server for direct talking */ struct lu_server_seq *lcs_srv; + + /* wait queue for fid allocation and update indicator */ + cfs_waitq_t lcs_waitq; + int lcs_update; }; /* server sequence manager interface */ @@ -193,8 +216,8 @@ struct lu_server_seq { /* Client interafce to request controller */ struct lu_client_seq *lss_cli; - /* Semaphore for protecting allocation */ - cfs_semaphore_t lss_sem; + /* Mutex for protecting allocation */ + cfs_mutex_t lss_mutex; /* * Service uuid, passed from MDT + seq name to form unique seq name to @@ -214,8 +237,8 @@ struct lu_server_seq { */ __u64 lss_set_width; - /* transaction no of seq update write operation */ - __u64 lss_set_transno; + /* sync is needed for update operation */ + __u32 lss_need_sync; /** * Pointer to site object, required to access site fld. */ @@ -258,8 +281,10 @@ void seq_client_fini(struct lu_client_seq *seq); void seq_client_flush(struct lu_client_seq *seq); -int seq_client_alloc_fid(struct lu_client_seq *seq, +int seq_client_alloc_fid(const struct lu_env *env, struct lu_client_seq *seq, struct lu_fid *fid); +int seq_client_get_seq(const struct lu_env *env, struct lu_client_seq *seq, + seqno_t *seqnr); /* Fids common stuff */ int fid_is_local(const struct lu_env *env, @@ -269,15 +294,12 @@ int fid_is_local(const struct lu_env *env, struct ldlm_namespace; -enum { - LUSTRE_RES_ID_SEQ_OFF = 0, - LUSTRE_RES_ID_OID_OFF = 1, - LUSTRE_RES_ID_VER_OFF = 2, - LUSTRE_RES_ID_HSH_OFF = 3 -}; - /* - * Build (DLM) resource name from fid. + * Build (DLM) resource name from FID. + * + * NOTE: until Lustre 1.8.7/2.1.1 the fid_ver() was packed into name[2], + * but was moved into name[1] along with the OID to avoid consuming the + * renaming name[2,3] fields that need to be used for the quota identifier. */ static inline struct ldlm_res_id * fid_build_reg_res_name(const struct lu_fid *f, @@ -285,8 +307,7 @@ fid_build_reg_res_name(const struct lu_fid *f, { memset(name, 0, sizeof *name); name->name[LUSTRE_RES_ID_SEQ_OFF] = fid_seq(f); - name->name[LUSTRE_RES_ID_OID_OFF] = fid_oid(f); - name->name[LUSTRE_RES_ID_VER_OFF] = fid_ver(f); + name->name[LUSTRE_RES_ID_VER_OID_OFF] = fid_ver_oid(f); return name; } @@ -296,10 +317,8 @@ fid_build_reg_res_name(const struct lu_fid *f, static inline int fid_res_name_eq(const struct lu_fid *f, const struct ldlm_res_id *name) { - return - name->name[LUSTRE_RES_ID_SEQ_OFF] == fid_seq(f) && - name->name[LUSTRE_RES_ID_OID_OFF] == fid_oid(f) && - name->name[LUSTRE_RES_ID_VER_OFF] == fid_ver(f); + return name->name[LUSTRE_RES_ID_SEQ_OFF] == fid_seq(f) && + name->name[LUSTRE_RES_ID_VER_OID_OFF] == fid_ver_oid(f); }