From 6b62de9c240bbf844a6ed72083e5c645cdd505e0 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 6 Aug 2005 14:54:40 +0000 Subject: [PATCH] - minor fixes after landing day --- lustre/include/linux/lustre_dlm.h | 2 +- lustre/mds/mds_open.c | 2 +- lustre/mds/mds_reint.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h index c89c598..dad6885 100644 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -106,7 +106,7 @@ typedef enum { #define LDLM_FL_CLEANED 0x800000 /* optimization hint: LDLM can run blocking callback from current context - * w/o involving separate thread. in order to decrease cs rate -bzzz */ + * w/o involving separate thread. in order to decrease cs rate */ #define LDLM_FL_ATOMIC_CB 0x1000000 /* while this flag is set, the lock can't change resource */ diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c index 5c7fdef..2c32397 100644 --- a/lustre/mds/mds_open.c +++ b/lustre/mds/mds_open.c @@ -1371,7 +1371,7 @@ got_child: struct ldlm_res_id child_res_id = { .name = {0}}; ldlm_policy_data_t sz_policy; struct lustre_handle sz_lockh; - int lock_flags = 0; + int lock_flags = LDLM_FL_ATOMIC_CB; child_res_id.name[0] = id_fid(&body->id1); child_res_id.name[1] = id_group(&body->id1); diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index 52812f82..2abd839 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -1429,7 +1429,7 @@ int enqueue_4ordered_locks(struct obd_device *obd,struct ldlm_res_id *p1_res_id, /* XXX we could send ASTs on all these locks first before blocking? */ for (i = 0; i < 4; i++) { - flags = 0; + flags = LDLM_FL_ATOMIC_CB; /* * nevertheless zeroed res_ids should be at the end of list, and -- 1.8.3.1