-/* -*- 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.
/*
* 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;
};
-struct osc_creator {
- cfs_spinlock_t oscc_lock;
- cfs_list_t oscc_wait_create_list;
- struct obd_device *oscc_obd;
- obd_id oscc_last_id;//last available pre-created object
- obd_id oscc_next_id;// what object id to give out next
- int oscc_grow_count;
- /**
- * Limit oscc_grow_count value, can be changed via proc fs
- */
- int oscc_max_grow_count;
- struct obdo oscc_oa;
- int oscc_flags;
- cfs_waitq_t oscc_waitq; /* creating procs wait on this */
-};
-
struct ec_export_data { /* echo client */
cfs_list_t eced_locks;
};
int fed_mod_count;/* items in fed_writing list */
long fed_pending; /* bytes just being written */
__u32 fed_group;
+ __u8 fed_pagesize; /* log2 of client page size */
+};
+
+struct mgs_export_data {
+ cfs_list_t med_clients; /* mgc fs client via this exp */
+ cfs_spinlock_t med_lock; /* protect med_clients */
};
/**
*/
cfs_atomic_t exp_rpc_count; /* RPC references */
cfs_atomic_t exp_cb_count; /* Commit callback references */
+ /** Number of queued replay requests to be processes */
+ cfs_atomic_t exp_replay_count;
cfs_atomic_t exp_locks_count; /** Lock references */
#if LUSTRE_TRACKS_LOCK_EXP_REFS
cfs_list_t exp_locks_list;
cfs_spinlock_t exp_locks_list_guard;
#endif
- /** Number of queued replay requests to be processes */
- cfs_atomic_t exp_replay_count;
/** UUID of client connected to this export */
struct obd_uuid exp_client_uuid;
/** To link all exports on an obd device */
cfs_list_t exp_obd_chain_timed;
/** Obd device of this export */
struct obd_device *exp_obd;
- /** "reverse" import to send requests (e.g. from ldlm) back to client */
+ /**
+ * "reverse" import to send requests (e.g. from ldlm) back to client
+ * exp_lock protect its change
+ */
struct obd_import *exp_imp_reverse;
struct nid_stat *exp_nid_stats;
struct lprocfs_stats *exp_md_stats;
__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;
+ /**
+ * Hash list for Posix lock deadlock detection, added with
+ * ldlm_lock::l_exp_flock_hash.
+ */
+ cfs_hash_t *exp_flock_hash;
cfs_list_t exp_outstanding_replies;
cfs_list_t exp_uncommitted_replies;
cfs_spinlock_t exp_uncommitted_replies_lock;
cfs_time_t exp_last_request_time;
/** On replay all requests waiting for replay are linked here */
cfs_list_t exp_req_replay_queue;
- /** protects exp_flags and exp_outstanding_replies */
+ /**
+ * protects exp_flags, exp_outstanding_replies and the change
+ * of exp_imp_reverse
+ */
cfs_spinlock_t exp_lock;
/** Compatibility flags for this export */
__u64 exp_connect_flags;
exp_libclient:1, /* liblustre client? */
/* 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 */
+ exp_abort_active_req:1,
+ /* if to swap nidtbl entries for 2.2 clients.
+ * Only used by the MGS to fix LU-1644. */
+ exp_need_mne_swab: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 */
+ /** 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;
};
return !!(exp->exp_connect_flags & OBD_CONNECT_SOM);
}
+static inline int exp_connect_umask(struct obd_export *exp)
+{
+ return !!(exp->exp_connect_flags & OBD_CONNECT_UMASK);
+}
+
static inline int imp_connect_lru_resize(struct obd_import *imp)
{
struct obd_connect_data *ocd;