From cc54db1faafd6b2f153cd92ab2a7d69cdaa6e78d Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 11 Jul 2005 04:50:14 +0000 Subject: [PATCH] move the initiation of fo_denylist/fo_denylist_lock from filter_setup to filter_common_setup --- lustre/obdfilter/filter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index f9e4bf9..f236898 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -1521,6 +1521,9 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf, INIT_LIST_HEAD(&filter->fo_llog_list); spin_lock_init(&filter->fo_llog_list_lock); + spin_lock_init(&filter->fo_denylist_lock); + INIT_LIST_HEAD(&filter->fo_denylist); + sprintf(ns_name, "filter-%s", obd->obd_uuid.uuid); obd->obd_namespace = ldlm_namespace_new(ns_name, LDLM_NAMESPACE_SERVER); @@ -1583,15 +1586,11 @@ static int filter_detach(struct obd_device *dev) static int filter_setup(struct obd_device *obd, obd_count len, void *buf) { - struct filter_obd *filter = &obd->u.filter; struct lustre_cfg *lcfg = buf; unsigned long page; int rc; ENTRY; - spin_lock_init(&filter->fo_denylist_lock); - INIT_LIST_HEAD(&filter->fo_denylist); - /* 2.6.9 selinux wants a full option page for do_kern_mount (bug6471) */ page = get_zeroed_page(GFP_KERNEL); if (!page) -- 1.8.3.1