* Lustre is a trademark of Sun Microsystems, Inc.
*/
-#define MAX_STRING_SIZE 128
-
extern int ldlm_srv_namespace_nr;
extern int ldlm_cli_namespace_nr;
extern struct mutex ldlm_srv_namespace_lock;
/* ldlm_request.c */
/* Cancel lru flag, it indicates we cancel aged locks. */
enum ldlm_lru_flags {
- LDLM_LRU_FLAG_AGED = 0x01, /* Cancel aged locks (non LRU resize) */
- LDLM_LRU_FLAG_PASSED = 0x02, /* Cancel passed number of locks */
- LDLM_LRU_FLAG_SHRINK = 0x04, /* Cancel locks from shrinker */
- LDLM_LRU_FLAG_LRUR = 0x08, /* Cancel locks from lru resize */
- LDLM_LRU_FLAG_NO_WAIT = 0x10, /* Cancel locks w/o blocking (neither
- * sending nor waiting for any RPCs) */
- LDLM_LRU_FLAG_CLEANUP = 0x20, /* Used when clearing lru, tells
- * prepare_lru_list to set discard flag
- * on PR extent locks so we don't waste
- * time saving pages that will be
- * discarded momentarily */
+ LDLM_LRU_FLAG_NO_WAIT = 0x1, /* Cancel locks w/o blocking (neither
+ * sending nor waiting for any RPCs) */
+ LDLM_LRU_FLAG_CLEANUP = 0x2, /* Used when clearing lru, tells
+ * prepare_lru_list to set discard flag
+ * on PR extent locks so we don't waste
+ * time saving pages that will be
+ * discarded momentarily */
};
-int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
+int ldlm_cancel_lru(struct ldlm_namespace *ns, int min,
enum ldlm_cancel_flags cancel_flags,
enum ldlm_lru_flags lru_flags);
int ldlm_cancel_lru_local(struct ldlm_namespace *ns,
- struct list_head *cancels, int count, int max,
+ struct list_head *cancels, int min, int max,
enum ldlm_cancel_flags cancel_flags,
enum ldlm_lru_flags lru_flags);
extern unsigned int ldlm_enqueue_min;
/* ldlm_resource.c */
extern struct kmem_cache *ldlm_resource_slab;
extern struct kmem_cache *ldlm_lock_slab;
+extern struct kmem_cache *ldlm_inodebits_slab;
extern struct kmem_cache *ldlm_interval_tree_slab;
void ldlm_resource_insert_lock_after(struct ldlm_lock *original,
struct ldlm_lock *new);
+void ldlm_resource_insert_lock_before(struct ldlm_lock *original,
+ struct ldlm_lock *new);
/* ldlm_lock.c */
#ifdef HAVE_SERVER_SUPPORT
int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue,
struct list_head *work_list,
- enum ldlm_process_intention intention);
+ enum ldlm_process_intention intention,
+ struct ldlm_lock *hint);
int ldlm_handle_conflict_lock(struct ldlm_lock *lock, __u64 *flags,
struct list_head *rpc_list);
void ldlm_discard_bl_list(struct list_head *bl_list);
-void ldlm_discard_bl_lock(struct ldlm_lock *lock);
void ldlm_clear_blocking_lock(struct ldlm_lock *lock);
-
+void ldlm_clear_blocking_data(struct ldlm_lock *lock);
#endif
int ldlm_run_ast_work(struct ldlm_namespace *ns, struct list_head *rpc_list,
ldlm_desc_ast_t ast_type);
ldlm_lock_remove_from_lru_check(lock, ktime_set(0, 0))
int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock);
void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock);
-void ldlm_lock_add_to_lru(struct ldlm_lock *lock);
void ldlm_lock_touch_in_lru(struct ldlm_lock *lock);
void ldlm_lock_destroy_nolock(struct ldlm_lock *lock);
void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
struct ldlm_lock_desc *ld, struct ldlm_lock *lock);
+void ldlm_bl_desc2lock(const struct ldlm_lock_desc *ld, struct ldlm_lock *lock);
#ifdef HAVE_SERVER_SUPPORT
/* ldlm_plain.c */
enum ldlm_process_intention intention,
enum ldlm_error *err,
struct list_head *work_list);
+int ldlm_reprocess_inodebits_queue(struct ldlm_resource *res,
+ struct list_head *queue,
+ struct list_head *work_list,
+ enum ldlm_process_intention intention,
+ struct ldlm_lock *hint);
/* ldlm_extent.c */
int ldlm_process_extent_lock(struct ldlm_lock *lock, __u64 *flags,
enum ldlm_process_intention intention,
enum ldlm_error *err, struct list_head *work_list);
#endif
+int ldlm_extent_alloc_lock(struct ldlm_lock *lock);
void ldlm_extent_add_lock(struct ldlm_resource *res, struct ldlm_lock *lock);
void ldlm_extent_unlink_lock(struct ldlm_lock *lock);
+int ldlm_inodebits_alloc_lock(struct ldlm_lock *lock);
+void ldlm_inodebits_add_lock(struct ldlm_resource *res, struct list_head *head,
+ struct ldlm_lock *lock);
+void ldlm_inodebits_unlink_lock(struct ldlm_lock *lock);
+
/* ldlm_flock.c */
int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
enum ldlm_process_intention intention,
struct ptlrpc_service *ldlm_cb_service;
struct ptlrpc_service *ldlm_cancel_service;
struct ptlrpc_client *ldlm_client;
- struct ptlrpc_connection *ldlm_server_conn;
struct ldlm_bl_pool *ldlm_bl_pool;
};
extern struct kmem_cache *ldlm_interval_slab; /* slab cache for ldlm_interval */
extern void ldlm_interval_attach(struct ldlm_interval *n, struct ldlm_lock *l);
extern struct ldlm_interval *ldlm_interval_detach(struct ldlm_lock *l);
-extern struct ldlm_interval *ldlm_interval_alloc(struct ldlm_lock *lock);
extern void ldlm_interval_free(struct ldlm_interval *node);
/* this function must be called with res lock held */
static inline struct ldlm_extent *
static ssize_t var##_store(struct kobject *kobj, \
struct attribute *attr, \
const char *buffer, \
- unsigned long count) \
+ size_t count) \
{ \
struct ldlm_pool *pl = container_of(kobj, struct ldlm_pool,\
pl_kobj); \
static ssize_t var##_store(struct kobject *kobj, \
struct attribute *attr, \
const char *buffer, \
- unsigned long count) \
+ size_t count) \
{ \
struct ldlm_pool *pl = container_of(kobj, struct ldlm_pool,\
pl_kobj); \
struct __##var##__dummy_write {; } /* semicolon catcher */
static inline void
-ldlm_add_var(struct lprocfs_vars *vars, struct dentry *debugfs_entry,
+ldlm_add_var(struct ldebugfs_vars *vars, struct dentry *debugfs_entry,
const char *name, void *data, const struct file_operations *ops)
{
- snprintf((char *)vars->name, MAX_STRING_SIZE, "%s", name);
+ vars->name = name;
vars->data = data;
vars->fops = ops;
ldebugfs_add_vars(debugfs_entry, vars, NULL);
static inline int is_granted_or_cancelled(struct ldlm_lock *lock)
{
- int ret = 0;
+ int ret = 0;
- lock_res_and_lock(lock);
- if ((lock->l_req_mode == lock->l_granted_mode) &&
- !ldlm_is_cp_reqd(lock))
- ret = 1;
- else if (ldlm_is_failed(lock) || ldlm_is_cancel(lock))
- ret = 1;
- unlock_res_and_lock(lock);
+ lock_res_and_lock(lock);
+ ret = is_granted_or_cancelled_nolock(lock);
+ unlock_res_and_lock(lock);
- return ret;
+ return ret;
}
static inline bool is_bl_done(struct ldlm_lock *lock)
return bl_done;
}
+static inline bool is_lock_converted(struct ldlm_lock *lock)
+{
+ bool ret = 0;
+
+ lock_res_and_lock(lock);
+ ret = (lock->l_policy_data.l_inodebits.cancel_bits == 0);
+ unlock_res_and_lock(lock);
+
+ return ret;
+}
+
typedef void (*ldlm_policy_wire_to_local_t)(const union ldlm_wire_policy_data *,
union ldlm_policy_data *);
typedef void (*ldlm_policy_local_to_wire_t)(const union ldlm_policy_data *,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff