From bfdf8e2aa29a28092265b0ef0009572e3838df95 Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 29 Mar 2005 20:33:39 +0000 Subject: [PATCH] Branch: b1_4 Use ldlm_type_t when storing lock type. --- lustre/include/linux/lustre_dlm.h | 2 +- lustre/include/linux/lustre_fsfilt.h | 2 +- lustre/ldlm/ldlm_lock.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h index 77c5f05..8686034 100644 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -265,7 +265,7 @@ struct ldlm_resource { struct list_head lr_converting; struct list_head lr_waiting; ldlm_mode_t lr_most_restr; - __u32 lr_type; /* LDLM_PLAIN or LDLM_EXTENT */ + ldlm_type_t lr_type; /* LDLM_PLAIN or LDLM_EXTENT */ struct ldlm_resource *lr_root; struct ldlm_res_id lr_name; atomic_t lr_refcount; diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h index 4e55481..86774a9 100644 --- a/lustre/include/linux/lustre_fsfilt.h +++ b/lustre/include/linux/lustre_fsfilt.h @@ -113,7 +113,7 @@ static inline void *fsfilt_start_log(struct obd_device *obd, unsigned long now = jiffies; void *parent_handle = oti ? oti->oti_handle : NULL; void *handle; - + if (obd->obd_fail) return ERR_PTR(-EROFS); diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index 9e57724..a8effa3 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -634,7 +634,7 @@ void ldlm_lock_allow_match(struct ldlm_lock *lock) * case, lockh is filled in with a addref()ed lock */ int ldlm_lock_match(struct ldlm_namespace *ns, int flags, - struct ldlm_res_id *res_id, __u32 type, + struct ldlm_res_id *res_id, ldlm_type_t type, ldlm_policy_data_t *policy, ldlm_mode_t mode, struct lustre_handle *lockh) { @@ -728,7 +728,7 @@ int ldlm_lock_match(struct ldlm_namespace *ns, int flags, /* Returns a referenced lock */ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, struct lustre_handle *parent_lock_handle, - struct ldlm_res_id res_id, __u32 type, + struct ldlm_res_id res_id, ldlm_type_t type, ldlm_mode_t mode, ldlm_blocking_callback blocking, ldlm_completion_callback completion, -- 1.8.3.1