Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4011cd97 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3d39c691

net/sunrpc/cache.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -371,8 +371,7 @@ int cache_unregister(struct cache_detail *cd) 
	}

	}

	if (list_empty(&cache_list)) {

	if (list_empty(&cache_list)) {

		/* module must be being unloaded so its safe to kill the worker */

		/* module must be being unloaded so its safe to kill the worker */

		cancel_delayed_work(&cache_cleaner);

		cancel_delayed_work_sync(&cache_cleaner);

		flush_scheduled_work();

	}

	}

	return 0;

	return 0;

}

}

net/sunrpc/rpc_pipe.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -132,8 +132,7 @@ rpc_close_pipes(struct inode *inode) 
		rpci->nwriters = 0;

		rpci->nwriters = 0;

		if (ops->release_pipe)

		if (ops->release_pipe)

			ops->release_pipe(inode);

			ops->release_pipe(inode);

		cancel_delayed_work(&rpci->queue_timeout);

		cancel_delayed_work_sync(&rpci->queue_timeout);

		flush_workqueue(rpciod_workqueue);

	}

	}

	rpc_inode_setowner(inode, NULL);

	rpc_inode_setowner(inode, NULL);

	mutex_unlock(&inode->i_mutex);

	mutex_unlock(&inode->i_mutex);