X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_export.h;h=f284babd16b8fcb44d48dd17c8e3effd19afd29a;hb=afba77b65ece6a0e32c42dd7990e758b71835ddb;hp=94033efa7e85ae91557c97beef4bf7a7b38b1a22;hpb=f31b79be5a0380df3ed05c16fa43feca2bf5905c;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h index 94033ef..f284bab 100644 --- a/lustre/include/lustre_export.h +++ b/lustre/include/lustre_export.h @@ -37,29 +37,41 @@ #ifndef __EXPORT_H #define __EXPORT_H +#include #include #include -#include #include -/* Data stored per client in the last_rcvd file. In le32 order. */ struct mds_client_data; struct mdt_client_data; struct mds_idmap_table; struct mdt_idmap_table; +struct lu_export_data { + /** Protects led_lcd below */ + struct semaphore led_lcd_lock; + /** Per-client data for each export */ + struct lsd_client_data *led_lcd; + /** Offset of record in last_rcvd file */ + loff_t led_lr_off; + /** Client index in last_rcvd file */ + int led_lr_idx; +}; + struct mdt_export_data { + struct lu_export_data med_led; struct list_head med_open_head; spinlock_t med_open_lock; /* lock med_open_head, mfd_list*/ - struct semaphore med_lcd_lock; - struct lsd_client_data *med_lcd; __u64 med_ibits_known; - loff_t med_lr_off; - int med_lr_idx; struct semaphore med_idmap_sem; struct lustre_idmap_table *med_idmap; }; +#define med_lcd_lock med_led.led_lcd_lock +#define med_lcd med_led.led_lcd +#define med_lr_off med_led.led_lr_off +#define med_lr_idx med_led.led_lr_idx + struct osc_creator { spinlock_t oscc_lock; struct list_head oscc_list; @@ -82,37 +94,52 @@ struct ec_export_data { /* echo client */ /* In-memory access to client data from OST struct */ struct filter_export_data { - spinlock_t fed_lock; /* protects fed_open_head */ - struct lsd_client_data *fed_lcd; - loff_t fed_lr_off; - int fed_lr_idx; + struct lu_export_data fed_led; + spinlock_t fed_lock; /**< protects fed_mod_list */ long fed_dirty; /* in bytes */ long fed_grant; /* in bytes */ struct list_head fed_mod_list; /* files being modified */ int fed_mod_count;/* items in fed_writing list */ long fed_pending; /* bytes just being written */ __u32 fed_group; - struct brw_stats fed_brw_stats; }; -typedef struct nid_stat_uuid { - struct list_head ns_uuid_list; - struct obd_uuid ns_uuid; -} nid_stat_uuid_t; +#define fed_lcd_lock fed_led.led_lcd_lock +#define fed_lcd fed_led.led_lcd +#define fed_lr_off fed_led.led_lr_off +#define fed_lr_idx fed_led.led_lr_idx typedef struct nid_stat { lnet_nid_t nid; struct hlist_node nid_hash; struct list_head nid_list; - struct list_head nid_uuid_list; struct obd_device *nid_obd; struct proc_dir_entry *nid_proc; struct lprocfs_stats *nid_stats; struct lprocfs_stats *nid_ldlm_stats; struct brw_stats *nid_brw_stats; - int nid_exp_ref_count; + atomic_t nid_exp_ref_count; /* for obd_nid_stats_hash + exp_nid_stats */ }nid_stat_t; +#define nidstat_getref(nidstat) \ +do { \ + atomic_inc(&(nidstat)->nid_exp_ref_count); \ +} while(0) + +#define nidstat_putref(nidstat) \ +do { \ + atomic_dec(&(nidstat)->nid_exp_ref_count); \ + LASSERTF(atomic_read(&(nidstat)->nid_exp_ref_count) >= 0, \ + "stat %p nid_exp_ref_count < 0\n", nidstat); \ +} while(0) + +enum obd_option { + OBD_OPT_FORCE = 0x0001, + OBD_OPT_FAILOVER = 0x0002, + OBD_OPT_ABORT_RECOV = 0x0004, +}; + struct obd_export { struct portals_handle exp_handle; atomic_t exp_refcount; @@ -132,22 +159,32 @@ struct obd_export { lustre_hash_t *exp_lock_hash; /* existing lock hash */ spinlock_t exp_lock_hash_lock; struct list_head exp_outstanding_replies; - time_t exp_last_request_time; + struct list_head exp_uncommitted_replies; + spinlock_t exp_uncommitted_replies_lock; + __u64 exp_last_committed; + cfs_time_t exp_last_request_time; struct list_head exp_req_replay_queue; spinlock_t exp_lock; /* protects flags int below */ /* ^ protects exp_outstanding_replies too */ __u64 exp_connect_flags; - int exp_flags; + enum obd_option exp_flags; unsigned long exp_failed:1, exp_in_recovery:1, exp_disconnected:1, exp_connecting:1, + /** VBR: export missed recovery */ + exp_delayed:1, + /** VBR: failed version checking */ + exp_vbr_failed:1, exp_req_replay_needed:1, exp_lock_replay_needed:1, exp_need_sync:1, exp_flvr_changed:1, exp_flvr_adapt:1, - exp_libclient:1; /* liblustre client? */ + exp_libclient:1, /* liblustre client? */ + /* client timed out and tried to reconnect, + * but couldn't because of active rpcs */ + exp_abort_active_req:1; struct list_head exp_queued_rpc; /* RPC to be handled */ /* also protected by exp_lock */ enum lustre_sec_part exp_sp_peer; @@ -156,16 +193,25 @@ struct obd_export { cfs_time_t exp_flvr_expire[2]; /* seconds */ union { + struct lu_export_data eu_target_data; struct mdt_export_data eu_mdt_data; struct filter_export_data eu_filter_data; struct ec_export_data eu_ec_data; } u; }; +#define exp_target_data u.eu_target_data #define exp_mdt_data u.eu_mdt_data #define exp_filter_data u.eu_filter_data #define exp_ec_data u.eu_ec_data +static inline int exp_expired(struct obd_export *exp, cfs_duration_t age) +{ + LASSERT(exp->exp_delayed); + return cfs_time_before(cfs_time_add(exp->exp_last_request_time, age), + cfs_time_current_sec()); +} + static inline int exp_connect_cancelset(struct obd_export *exp) { LASSERT(exp != NULL); @@ -192,6 +238,19 @@ static inline int client_is_remote(struct obd_export *exp) OBD_CONNECT_RMT_CLIENT); } +static inline int exp_connect_vbr(struct obd_export *exp) +{ + LASSERT(exp != NULL); + LASSERT(exp->exp_connection); + return !!(exp->exp_connect_flags & OBD_CONNECT_VBR); +} + +static inline int exp_connect_som(struct obd_export *exp) +{ + LASSERT(exp != NULL); + return !!(exp->exp_connect_flags & OBD_CONNECT_SOM); +} + static inline int imp_connect_lru_resize(struct obd_import *imp) { struct obd_connect_data *ocd;