diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c')
-rw-r--r-- | drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index b7b6ca1..ac79db9 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -76,15 +76,6 @@ inline unsigned long round_timeout(unsigned long timeout) return cfs_time_seconds((int)cfs_duration_sec(cfs_time_sub(timeout, 0)) + 1); } -/* timeout for initial callback (AST) reply (bz10399) */ -static inline unsigned int ldlm_get_rq_timeout(void) -{ - /* Non-AT value */ - unsigned int timeout = min(ldlm_timeout, obd_timeout / 3); - - return timeout < 1 ? 1 : timeout; -} - #define ELT_STOPPED 0 #define ELT_READY 1 #define ELT_TERMINATE 2 @@ -225,7 +216,7 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, void *lvb_data; lvb_data = kzalloc(lvb_len, GFP_NOFS); - if (lvb_data == NULL) { + if (!lvb_data) { LDLM_ERROR(lock, "No memory: %d.\n", lvb_len); rc = -ENOMEM; goto out; @@ -453,7 +444,7 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_bl_work_item *blwi; blwi = kzalloc(sizeof(*blwi), GFP_NOFS); - if (blwi == NULL) + if (!blwi) return -ENOMEM; init_blwi(blwi, ns, ld, cancels, count, lock, cancel_flags); @@ -1053,7 +1044,7 @@ static int ldlm_setup(void) return -EALREADY; ldlm_state = kzalloc(sizeof(*ldlm_state), GFP_NOFS); - if (ldlm_state == NULL) + if (!ldlm_state) return -ENOMEM; ldlm_kobj = kobject_create_and_add("ldlm", lustre_kobj); @@ -1123,7 +1114,7 @@ static int ldlm_setup(void) blp = kzalloc(sizeof(*blp), GFP_NOFS); - if (blp == NULL) { + if (!blp) { rc = -ENOMEM; goto out; } |