Address the comments from cevich.

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>