Re: [PATCH 01/10] staging: lustre: ldlm: store name directly in namespace.
From: Dilger, Andreas
Date: Tue May 01 2018 - 00:06:19 EST
On Apr 30, 2018, at 21:52, NeilBrown <neilb@xxxxxxxx> wrote:
>
> Rather than storing the name of a namespace in the
> hash table, store it directly in the namespace.
> This will allow the hashtable to be changed to use
> rhashtable.
>
> Signed-off-by: NeilBrown <neilb@xxxxxxxx>
Reviewed-by: Andreas Dilger <andreas.dilger@xxxxxxxxx>
> ---
> drivers/staging/lustre/lustre/include/lustre_dlm.h | 5 ++++-
> drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 5 +++++
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
> index d668d86423a4..b3532adac31c 100644
> --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
> +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
> @@ -362,6 +362,9 @@ struct ldlm_namespace {
> /** Flag indicating if namespace is on client instead of server */
> enum ldlm_side ns_client;
>
> + /** name of this namespace */
> + char *ns_name;
> +
> /** Resource hash table for namespace. */
> struct cfs_hash *ns_rs_hash;
>
> @@ -878,7 +881,7 @@ static inline bool ldlm_has_layout(struct ldlm_lock *lock)
> static inline char *
> ldlm_ns_name(struct ldlm_namespace *ns)
> {
> - return ns->ns_rs_hash->hs_name;
> + return ns->ns_name;
> }
>
> static inline struct ldlm_namespace *
> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
> index 6c615b6e9bdc..43bbc5fd94cc 100644
> --- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
> +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
> @@ -688,6 +688,9 @@ struct ldlm_namespace *ldlm_namespace_new(struct obd_device *obd, char *name,
> ns->ns_obd = obd;
> ns->ns_appetite = apt;
> ns->ns_client = client;
> + ns->ns_name = kstrdup(name, GFP_KERNEL);
> + if (!ns->ns_name)
> + goto out_hash;
>
> INIT_LIST_HEAD(&ns->ns_list_chain);
> INIT_LIST_HEAD(&ns->ns_unused_list);
> @@ -730,6 +733,7 @@ struct ldlm_namespace *ldlm_namespace_new(struct obd_device *obd, char *name,
> ldlm_namespace_sysfs_unregister(ns);
> ldlm_namespace_cleanup(ns, 0);
> out_hash:
> + kfree(ns->ns_name);
> cfs_hash_putref(ns->ns_rs_hash);
> out_ns:
> kfree(ns);
> @@ -993,6 +997,7 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns)
> ldlm_namespace_debugfs_unregister(ns);
> ldlm_namespace_sysfs_unregister(ns);
> cfs_hash_putref(ns->ns_rs_hash);
> + kfree(ns->ns_name);
> /* Namespace \a ns should be not on list at this time, otherwise
> * this will cause issues related to using freed \a ns in poold
> * thread.
>
>
Cheers, Andreas
--
Andreas Dilger
Lustre Principal Architect
Intel Corporation