Commit c2fcdf6c authored by Jinshan Xiong's avatar Jinshan Xiong Committed by Greg Kroah-Hartman

staging/lustre/llite: to configure max_cached_mb correctly

If there exists MGS conf_param to reduce the memory cache
max_cached_mb it will fail because dt_exp is not initialized
yet.

It should just go ahead and configure it because certainly it
have enough free LRU slot to deduct ccc_lru_left.
Signed-off-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-on: http://review.whamcloud.com/11783
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3676Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af3fa7c7
...@@ -399,9 +399,6 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file, ...@@ -399,9 +399,6 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file,
return -ERANGE; return -ERANGE;
} }
if (sbi->ll_dt_exp == NULL)
return -ENODEV;
spin_lock(&sbi->ll_lock); spin_lock(&sbi->ll_lock);
diff = pages_number - cache->ccc_lru_max; diff = pages_number - cache->ccc_lru_max;
spin_unlock(&sbi->ll_lock); spin_unlock(&sbi->ll_lock);
...@@ -437,6 +434,11 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file, ...@@ -437,6 +434,11 @@ static ssize_t ll_max_cached_mb_seq_write(struct file *file,
if (diff <= 0) if (diff <= 0)
break; break;
if (sbi->ll_dt_exp == NULL) { /* being initialized */
rc = -ENODEV;
break;
}
/* difficult - have to ask OSCs to drop LRU slots. */ /* difficult - have to ask OSCs to drop LRU slots. */
tmp = diff << 1; tmp = diff << 1;
rc = obd_set_info_async(NULL, sbi->ll_dt_exp, rc = obd_set_info_async(NULL, sbi->ll_dt_exp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment