From 984c4df4c2007c4d81c3aad3478739e16ae6ff6c Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 7 Aug 2007 15:28:33 -0400 Subject: [PATCH] --- yaml --- r: 63830 b: refs/heads/master c: 3d39c691ff486142dd9aaeac12f553f4476b7a62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/namespace.c | 6 ++---- trunk/fs/nfs/nfs4renewd.c | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3d2d3be3e744..4f0a7c0087fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4deb81ba8ece75af5560d40d9bb8d242c48a111 +refs/heads/master: 3d39c691ff486142dd9aaeac12f553f4476b7a62 diff --git a/trunk/fs/nfs/namespace.c b/trunk/fs/nfs/namespace.c index 7f86e65182e4..aea76d0e5fbd 100644 --- a/trunk/fs/nfs/namespace.c +++ b/trunk/fs/nfs/namespace.c @@ -175,10 +175,8 @@ static void nfs_expire_automounts(struct work_struct *work) void nfs_release_automount_timer(void) { - if (list_empty(&nfs_automount_list)) { - cancel_delayed_work(&nfs_automount_task); - flush_scheduled_work(); - } + if (list_empty(&nfs_automount_list)) + cancel_delayed_work_sync(&nfs_automount_task); } /* diff --git a/trunk/fs/nfs/nfs4renewd.c b/trunk/fs/nfs/nfs4renewd.c index 0505ca124034..3ea352d82eba 100644 --- a/trunk/fs/nfs/nfs4renewd.c +++ b/trunk/fs/nfs/nfs4renewd.c @@ -127,16 +127,15 @@ nfs4_schedule_state_renewal(struct nfs_client *clp) void nfs4_renewd_prepare_shutdown(struct nfs_server *server) { - flush_scheduled_work(); + cancel_delayed_work(&server->nfs_client->cl_renewd); } void nfs4_kill_renewd(struct nfs_client *clp) { down_read(&clp->cl_sem); - cancel_delayed_work(&clp->cl_renewd); + cancel_delayed_work_sync(&clp->cl_renewd); up_read(&clp->cl_sem); - flush_scheduled_work(); } /*