relay: fix cpu offline problem
relay_open() will close allocated buffers when failed. but if cpu offlined, some buffer will not be closed. this patch fixed it. and did cleanup for relay_reset() too. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
committed by
Jens Axboe
parent
68aee07f9b
commit
98ba4031ab
@@ -400,7 +400,7 @@ void relay_reset(struct rchan *chan)
|
|||||||
}
|
}
|
||||||
|
|
||||||
mutex_lock(&relay_channels_mutex);
|
mutex_lock(&relay_channels_mutex);
|
||||||
for_each_online_cpu(i)
|
for_each_possible_cpu(i)
|
||||||
if (chan->buf[i])
|
if (chan->buf[i])
|
||||||
__relay_reset(chan->buf[i], 0);
|
__relay_reset(chan->buf[i], 0);
|
||||||
mutex_unlock(&relay_channels_mutex);
|
mutex_unlock(&relay_channels_mutex);
|
||||||
@@ -611,10 +611,9 @@ struct rchan *relay_open(const char *base_filename,
|
|||||||
return chan;
|
return chan;
|
||||||
|
|
||||||
free_bufs:
|
free_bufs:
|
||||||
for_each_online_cpu(i) {
|
for_each_possible_cpu(i) {
|
||||||
if (!chan->buf[i])
|
if (chan->buf[i])
|
||||||
break;
|
relay_close_buf(chan->buf[i]);
|
||||||
relay_close_buf(chan->buf[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
kref_put(&chan->kref, relay_destroy_channel);
|
kref_put(&chan->kref, relay_destroy_channel);
|
||||||
|
Reference in New Issue
Block a user