* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 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/
*/
struct tg_export_data {
/** Protects led_lcd below */
- cfs_semaphore_t ted_lcd_lock;
+ cfs_mutex_t ted_lcd_lock;
/** Per-client data for each export */
struct lsd_client_data *ted_lcd;
/** Offset of record in last_rcvd file */
cfs_spinlock_t med_open_lock; /* lock med_open_head, mfd_list*/
/** Bitmask of all ibit locks this MDT understands */
__u64 med_ibits_known;
- cfs_semaphore_t med_idmap_sem;
+ cfs_mutex_t med_idmap_mutex;
struct lustre_idmap_table *med_idmap;
};
__u32 fed_group;
};
+struct mgs_export_data {
+ cfs_list_t med_clients; /* mgc fs client via this exp */
+ cfs_spinlock_t med_lock; /* protect med_clients */
+};
+
/**
* per-NID statistics structure.
* It tracks access patterns to this export on a per-client-NID basis
__u32 exp_conn_cnt;
/** Hash list of all ldlm locks granted on this export */
cfs_hash_t *exp_lock_hash;
- /** lock to protect exp_lock_hash accesses */
- cfs_spinlock_t exp_lock_hash_lock;
+ /** Lock protecting access to exp_flock_wait_list */
+ cfs_rwlock_t exp_flock_wait_lock;
+ /**
+ * Wait queue for Posix lock deadlock detection, added with
+ * ldlm_lock::l_flock_waitq.
+ */
+ cfs_list_t exp_flock_wait_list;
cfs_list_t exp_outstanding_replies;
cfs_list_t exp_uncommitted_replies;
cfs_spinlock_t exp_uncommitted_replies_lock;
/* client timed out and tried to reconnect,
* but couldn't because of active rpcs */
exp_abort_active_req:1;
- cfs_list_t exp_queued_rpc; /* RPC to be handled */
/* 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 */
+ /** protects exp_hp_rpcs */
+ cfs_spinlock_t exp_rpc_lock;
+ cfs_list_t exp_hp_rpcs; /* (potential) HP RPCs */
+
+ /** blocking dlm lock list, protected by exp_bl_list_lock */
+ cfs_list_t exp_bl_list;
+ cfs_spinlock_t exp_bl_list_lock;
+
/** Target specific data */
union {
struct tg_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;
+ struct mgs_export_data eu_mgs_data;
} u;
};