Commit f13ab92e authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

staging: lustre: fix to use list_for_each_entry_safe() when delete items 



Since we will remove items off the list using list_del_init() we need
to use a safe version of the list_for_each_entry() macro aptly named
list_for_each_entry_safe().

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 49c144c8

drivers/staging/lustre/lustre/osc/osc_cache.c

+2 −2
Original line number Diff line number Diff line
@@ -2620,7 +2620,7 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj, 
{

	struct client_obd     *cli = osc_cli(obj);

	struct osc_extent     *ext;

	struct osc_async_page *oap;

	struct osc_async_page *oap, *tmp;

	int     page_count = 0;

	int     mppr       = cli->cl_max_pages_per_rpc;

	pgoff_t start      = CL_PAGE_EOF;
@@ -2639,7 +2639,7 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj, 


	ext = osc_extent_alloc(obj);

	if (ext == NULL) {

		list_for_each_entry(oap, list, oap_pending_item) {

		list_for_each_entry_safe(oap, tmp, list, oap_pending_item) {

			list_del_init(&oap->oap_pending_item);

			osc_ap_completion(env, cli, oap, 0, -ENOMEM);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE