X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_export.h;h=b5ca7f7e3e249cd9feb976e65b672ccb2dd1e3d7;hb=e9389613eb29297f7b5a6b6cd896bafc7a5551f8;hp=851edca48c4d4f690aa65886d3701b49ee45c70b;hpb=b0638b322b8c8adb2cf5f6189efd17ad70f3af2c;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h index 851edca..b5ca7f7 100644 --- a/lustre/include/lustre_export.h +++ b/lustre/include/lustre_export.h @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -59,7 +55,8 @@ struct mdt_idmap_table; * Target-specific export data */ struct tg_export_data { - /** Protects led_lcd below */ + /** Protects ted_lcd, ted_reply_* and + * ted_release_* fields below */ struct mutex ted_lcd_lock; /** Per-client data for each export */ struct lsd_client_data *ted_lcd; @@ -68,9 +65,40 @@ struct tg_export_data { /** Client index in last_rcvd file */ int ted_lr_idx; - /** nodemap this export is a member of */ + /** + * ted_nodemap_lock is used to ensure that the nodemap is not destroyed + * between the time that ted_nodemap is checked for NULL, and a + * reference is taken. Modifications to ted_nodemap require that the + * active_config_lock and the nodemap(s)'s nm_member_list_lock be + * taken, as well as ted_nodemap_lock, so the export can be properly + * added to or removed from the nodemap's member list. When an export + * is added to a nodemap, a reference on that nodemap must be taken. + * That reference can be put only after ted_nodemap no longer refers to + * it. + */ + spinlock_t ted_nodemap_lock; struct lu_nodemap *ted_nodemap; - struct hlist_node ted_nodemap_member; + struct list_head ted_nodemap_member; + + /** last version of nodemap config sent to client */ + __u64 ted_nodemap_version; + + /* Every reply data fields below are + * protected by ted_lcd_lock */ + /** List of reply data */ + struct list_head ted_reply_list; + int ted_reply_cnt; + /** Reply data with highest transno is retained */ + struct tg_reply_data *ted_reply_last; + /* Statistics */ + int ted_reply_max; /* high water mark */ + int ted_release_xid; + int ted_release_tag; + /* grants */ + long ted_dirty; /* in bytes */ + long ted_grant; /* in bytes */ + long ted_pending; /* bytes just being written */ + __u8 ted_pagebits; /* log2 of client page size */ }; /** @@ -81,8 +109,6 @@ struct mdt_export_data { /** List of all files opened by client on this MDT */ struct list_head med_open_head; spinlock_t med_open_lock; /* med_open_head, mfd_list */ - struct mutex med_idmap_mutex; - struct lustre_idmap_table *med_idmap; }; struct ec_export_data { /* echo client */ @@ -95,16 +121,12 @@ struct filter_export_data { struct tg_export_data fed_ted; spinlock_t fed_lock; /**< protects fed_mod_list */ __u64 fed_lastid_gen; - long fed_dirty; /* in bytes */ - long fed_grant; /* in bytes */ struct list_head fed_mod_list; /* files being modified */ - long fed_pending; /* bytes just being written */ /* count of SOFT_SYNC RPCs, which will be reset after * ofd_soft_sync_limit number of RPCs, and trigger a sync. */ atomic_t fed_soft_sync_count; int fed_mod_count;/* items in fed_writing list */ __u32 fed_group; - __u8 fed_pagesize; /* log2 of client page size */ }; struct mgs_export_data { @@ -180,8 +202,11 @@ struct obd_export { struct obd_uuid exp_client_uuid; /** To link all exports on an obd device */ struct list_head exp_obd_chain; + /* Unlinked export list */ + struct list_head exp_stale_list; struct hlist_node exp_uuid_hash; /** uuid-export hash*/ struct hlist_node exp_nid_hash; /** nid-export hash */ + struct hlist_node exp_gen_hash; /** last_rcvd clt gen hash */ /** * All exports eligible for ping evictor are linked into a list * through this field in "most time since last request on this export" @@ -202,12 +227,12 @@ struct obd_export { /** Connection count value from last successful reconnect rpc */ __u32 exp_conn_cnt; /** Hash list of all ldlm locks granted on this export */ - cfs_hash_t *exp_lock_hash; + struct cfs_hash *exp_lock_hash; /** * Hash list for Posix lock deadlock detection, added with * ldlm_lock::l_exp_flock_hash. */ - cfs_hash_t *exp_flock_hash; + struct cfs_hash *exp_flock_hash; struct list_head exp_outstanding_replies; struct list_head exp_uncommitted_replies; spinlock_t exp_uncommitted_replies_lock; @@ -237,18 +262,20 @@ struct obd_export { exp_req_replay_needed:1, exp_lock_replay_needed:1, exp_need_sync:1, - exp_keep_sync:1, exp_flvr_changed:1, exp_flvr_adapt:1, exp_libclient:1, /* liblustre client? */ /* if to swap nidtbl entries for 2.2 clients. * Only used by the MGS to fix LU-1644. */ - exp_need_mne_swab:1; + exp_need_mne_swab:1, + /* The export already got final replay ping + * request. */ + exp_replay_done:1; /* also protected by exp_lock */ enum lustre_sec_part exp_sp_peer; struct sptlrpc_flavor exp_flvr; /* current */ struct sptlrpc_flavor exp_flvr_old[2]; /* about-to-expire */ - cfs_time_t exp_flvr_expire[2]; /* seconds */ + time64_t exp_flvr_expire[2]; /* seconds */ /** protects exp_hp_rpcs */ spinlock_t exp_rpc_lock; @@ -269,6 +296,11 @@ struct obd_export { } u; struct adaptive_timeout exp_bl_lock_at; + + /** highest XID received by export client that has no + * unreceived lower-numbered XID + */ + __u64 exp_last_xid; }; #define exp_target_data u.eu_target_data @@ -319,20 +351,6 @@ static inline int exp_connect_lru_resize(struct obd_export *exp) return !!(exp_connect_flags(exp) & OBD_CONNECT_LRU_RESIZE); } -static inline int exp_connect_rmtclient(struct obd_export *exp) -{ - LASSERT(exp != NULL); - return !!(exp_connect_flags(exp) & OBD_CONNECT_RMT_CLIENT); -} - -static inline int client_is_remote(struct obd_export *exp) -{ - struct obd_import *imp = class_exp2cliimp(exp); - - return !!(imp->imp_connect_data.ocd_connect_flags & - OBD_CONNECT_RMT_CLIENT); -} - static inline int exp_connect_vbr(struct obd_export *exp) { LASSERT(exp != NULL);