diff options
| author | Dmitry Eremin <dmitry.eremin@intel.com> | 2016-09-18 16:38:20 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 09:53:45 +0200 |
| commit | ba40ae79f1f7c104b4bd2fcc5df2c949e379aa0d (patch) | |
| tree | 3fae8c4f6c5d14fa0edb51d39f979d02c0a0a64b /drivers/staging/lustre | |
| parent | 816afc79f8370841c2f2b460cf93ba6ab74f99d7 (diff) | |
| download | linux-ba40ae79f1f7c104b4bd2fcc5df2c949e379aa0d.tar.bz2 | |
staging: lustre: obdclass: lu_htable_order() return type to long
Change the type accordant usage.
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5577
Reviewed-on: http://review.whamcloud.com/12385
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/lu_object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c index 439511751402..7339c8b2bee7 100644 --- a/drivers/staging/lustre/lustre/obdclass/lu_object.c +++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c @@ -352,7 +352,7 @@ int lu_site_purge(const struct lu_env *env, struct lu_site *s, int nr) * the dispose list, removing them from LRU and hash table. */ start = s->ls_purge_start; - bnr = (nr == ~0) ? -1 : nr / CFS_HASH_NBKT(s->ls_obj_hash) + 1; + bnr = (nr == ~0) ? -1 : nr / (int)CFS_HASH_NBKT(s->ls_obj_hash) + 1; again: /* * It doesn't make any sense to make purge threads parallel, that can @@ -869,11 +869,11 @@ EXPORT_SYMBOL(lu_site_print); /** * Return desired hash table order. */ -static unsigned int lu_htable_order(struct lu_device *top) +static unsigned long lu_htable_order(struct lu_device *top) { unsigned long bits_max = LU_SITE_BITS_MAX; unsigned long cache_size; - unsigned int bits; + unsigned long bits; /* * Calculate hash table size, assuming that we want reasonable @@ -990,7 +990,7 @@ int lu_site_init(struct lu_site *s, struct lu_device *top) memset(s, 0, sizeof(*s)); mutex_init(&s->ls_purge_mutex); - snprintf(name, 16, "lu_site_%s", top->ld_type->ldt_name); + snprintf(name, sizeof(name), "lu_site_%s", top->ld_type->ldt_name); for (bits = lu_htable_order(top); bits >= LU_SITE_BITS_MIN; bits--) { s->ls_obj_hash = cfs_hash_create(name, bits, bits, bits - LU_SITE_BKT_BITS, |